gentoo auto-resync : 15:05:2024 - 00:01:27

10 files changed, 347 insertions, 493 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 2b4ad1ae6ba8..314e11601481 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord/Manifest b/net-im/discord/Manifest
index 9dd67052934a..8307a48cae0b 100644
--- a/net-im/discord/Manifest
+++ b/net-im/discord/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.53.tar.gz 101433131 BLAKE2B 003b56fb9724e93a2dbb73b6c32e2a45b1f5456f3b57d855496654df3d8bd5cf36c784f64cff9e3ae28b062dc97704b814a8cabb5cf5bfdc5b6a71bdbd298558 SHA512 dfc92d477397324383a4656a770c0aac153527002b07bac56ec5e3947443f2ab6d0958b2c508d6cf5ed2ecaff83b64616387b7a2459d340b438c3d73ab0f6f83
-EBUILD discord-0.0.53.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
+DIST discord-0.0.54.tar.gz 101434444 BLAKE2B 0906baa1f68c46120372c3228858119aa73470966cdfdc5edfe3200fb4d3695c36e375e4687d914e881a08bc9216a69c1ea5ce49479c61d9bc08b76681999250 SHA512 ceb6265e846fafd27e3c2941f00f0a2d4e045abe5471a2691b070bedb330ef345edee838a706b27ff65ecce40aec46b1a1dd9c4bb9763dadaa907ec181c1a222
+EBUILD discord-0.0.54.ebuild 3517 BLAKE2B 376f475de1231064440fa4508621101f2668319cc0d1b91592bfed39e5673994fc2c7a6fbd4e8df88e301d17ca6975e75cb2a5ecc0db591ad608235ad29769c1 SHA512 2e7678d3c65b235ec6d955e13af6b73447a1e32cd79592bcca1948ab232cb5f6f270cc6cc61c8f356f9c32ad539d9920f613d2df749590fd9498a1195532e751
 MISC metadata.xml 506 BLAKE2B ff098a1c9341a94ebb21da57c3028d3d96e884e19e3adf2df8d50b694a1ca3eee61f5dfd90eaa557a0a0eee769fd11dfa7bbf63308386a11faa56d13687e33c3 SHA512 56baf0a5323057b4af83a7b7d760b2b1e071e15ca4eef6546eab4104fbdd026906f68d8023a3155f492d8d93cd7022c5d0017372cbaf2894b94bd253b2ce3665
diff --git a/net-im/discord/discord-0.0.53.ebuild b/net-im/discord/discord-0.0.54.ebuild
index fefed5b524d7..fefed5b524d7 100644
--- a/net-im/discord/discord-0.0.53.ebuild
+++ b/net-im/discord/discord-0.0.54.ebuild
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 3398494c842b..0394c10ddafa 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -60,8 +60,11 @@ DIST regex-syntax-0.8.2.crate 347228 BLAKE2B 211fd1c35ad0f28874d4b4d276e0fb0a27e
 DIST ryu-1.0.11.crate 47007 BLAKE2B d03e8df69c3b21c1b2e4ffa91ece794f141e9f9bce4e9ed1ebf394b1cb0f796147b86189885f0734df8f431b2d166d8f6ed6a261be398d6d088fd56046a85c2e SHA512 dd2642aab2d3017c31432436226d5350b894c8b88a09395eb7de6350964b3cc48451a829ce78b04a9e4e0480076fe1bddd0604f4e57700faa2d60cac6e361408
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
 DIST serde-1.0.197.crate 77087 BLAKE2B 4a4e04ededf5fefaabfcc4e17457db823239e8eeee7631a905ed47800ca10d26a93632e3a9d1b784b83f84168d0d649cfa2e6f5f1e68ab15a68e837cd5b6c699 SHA512 69e42825fce6a0a5d109979785daceacfd6afc5641e202fe83da32e2b1f968416557cce97fa014839e873e65f85c27494c8f8e20e6e9e4fbedf20d0291880410
+DIST serde-1.0.200.crate 77611 BLAKE2B 57f4a76cf534ffda009a5441e694b0ac87b30e470c97d77bfd572eb54f039c3cec56f9bf5e035e4b3b257ddb341cb4b7fdb85ca3c4684167220dbb98d1e6a762 SHA512 d4d01d62e7338b147f83bdbe358813e70b7ac218ddbdeab534926d205d46f86e2086f73a01f453c9d4a3bfed07e10d57ebd1f86bdafd4fe96c6298f1e527b8eb
 DIST serde_derive-1.0.197.crate 55771 BLAKE2B 73708908b6d1e104af4c63b498bd25c5a728e07e22afdf92f15754c0f17636efe44c0560c1f0df1b9a30708e8e8894a62f1ea57c234b6dd861cb9c8dc044eb4b SHA512 669376e248b76a5ee8b9c93fd9fe6d35372e7267fbabc14730539ef28a94e405ee5e9c2cc2846897d59d6153742cdc6799f9e2c87f20b9dad119bd3a86c28994
+DIST serde_derive-1.0.200.crate 55785 BLAKE2B 45eca5504aff6bd099a42dfc794cf732c7e76e5ed362d16082ac069d29e1e6c22bb3e13dede4bc498df8f008bdba15479de618380f37c9742a34d97c9ca12efe SHA512 e70f0e092d81542a96b33610da8ddbf04023d8ecc1fa4a4f31978699c118f096e8534f9e3e4e479ee74280efb86d752dd1fce038ef2def329fdcc10c1aa50942
 DIST serde_json-1.0.115.crate 147100 BLAKE2B baa2dce9d85e331d1308f2ece9dbeff24bcc70e37be3f06c7e819ad9f4eb59fb1f00658736fd336a41a65e3616d1bf75a0c9adb359eb606e1418159a9455132f SHA512 d1a60e20af770fdfe0585853c87c5631e56944a3c1bbdf9e1e91003af8e924a8076335bd37563d167c760aad10d4c08fe59ebd47fc52e461bc3586b835808d22
+DIST serde_json-1.0.116.crate 146790 BLAKE2B 20492ac3c431fd3666599f079383a9d945549e02357127a58acaa7011684ef0caca221a253218402ceff6956ee8a20cc41ca3394b25bb69669be75ab22b66a1e SHA512 d383de754b0a50cc4ab3e6378b758ebd6178ad32ebed80cb4e32a9d8e81d0c689585ee5cd35f12b376e488d25ecfaca659be943c9bb4104b63a1c4f9ded2f337
 DIST sha1-0.10.5.crate 12146 BLAKE2B 476a0c365ab639a0ce427856787595865a60339fd6b81a45f879ff9b9112021d2c3a62e0a817b4555951131a7fe257d0c30988631ddddc3d217274c46c79ebe6 SHA512 1046b91a9ea64b90098ee6e16c63f0620dc7c2dc847d200972a3da3c8d1ac61fa9030682099a411cdd24717b64d488e0b1be1cbe8f7bfee26b8c15cf4f8e5e9b
 DIST sha2-0.10.8.crate 26357 BLAKE2B 1d01b381223a931dc631ad3a1191f5378b1d2f3f9f20474c5f020e366624c73b08330ce8dc4bdd3e63b15f647276f533de655b545b77f70fbedc1a1846f44f0a SHA512 3be73133a6b7690e14acaead47914dc92395dca4191fb657a2ea186fefd0ccd94d12a1121d63a26027d9a9c62b775c53202473edc461587b9dcd75472af77785
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
@@ -69,6 +72,7 @@ DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST synapse-1.105.1.gh.tar.gz 8484079 BLAKE2B e4e0f495f749b0dde103788204308b1eaeaca60e99580d5f23c02e5149294771bbf0e53d5a80190fe32e5fb5dac9c6e925b34f11586f9ef1e61f093340286329 SHA512 be597b90c63306bc39f39a1e26f2daa76dcd986b155bcb2a4d191fece3f743004ee5d94723aba0f7d5744f6bf827c4fa26b972c03c0b7216f35838b5f2fffe4d
 DIST synapse-1.106.0.gh.tar.gz 8496922 BLAKE2B 2d078927c89da8fbc794536fbb1b30ec20565b9e6be41e8cbbb043b7a1fec4945d4a396d520d0980380dadde927d6146cc88ca01238c0d9220f093bdf88fce08 SHA512 6d9faca9131431190202947bf995e50c9ff7ea57d0ab8f5be324585223eaacdd925a99c66d2db64da426a0551c86d52a79871e43c08da22dcededbce7a44a2e9
+DIST synapse-1.107.0.gh.tar.gz 8500938 BLAKE2B c4cc8962ab47239ae0ad80964d377c6adc1180d4cfc7b72bd0f912c3322afd4386fdc81527d90e76c06e27a21f6c21c466eadffcfff7ecc31d385b2e91b2ee17 SHA512 3597a7a903002f5e5e252d2d08cb4697ec0ca95333b53b0bba79ada9dfed64f0a7f9f1c753ad0ed8c5543a75358b8c1e8fe42496516f740025235a6b8f79005b
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST ulid-1.1.2.crate 11517 BLAKE2B b15ec0ddd8f4936de1533fb347888b0dc6d0755ee7cb8e11a54e70a4accf0f3558b06e5bf48a8f06199b030510dcfbc1d4180d94e9d7516ef7bede728dab2221 SHA512 6bad4dcc2cbd5c05b1d535e6d8bb91da84cf2ee8c2d6c189ce302f5d5c3757d7878ccefaebeaaed93b8b7d90ec4d22033f9aee7f9a22a9329ce9b391934a3b12
@@ -90,4 +94,5 @@ DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca2
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
 EBUILD synapse-1.105.1.ebuild 5600 BLAKE2B 1b3e1902e789d64ca01a4faaf5972defe64d9d458301cfbbb7e2b4e7ab5b93063f6030bab400d64eb1b6a0de10d844a6120b3a0185cd853d18e357e1cb753917 SHA512 875fb702f5e21c4c2c2244dfc96f7dfb5bda91e8f7ad5a23db36ee280ff8117d46e0c69cdbfd11ce57b47b52af4002e375c2e349e2331e9187fdd46fd027f559
 EBUILD synapse-1.106.0.ebuild 6082 BLAKE2B 52da912b08dc09e50b280ee1d204f9b63dc4f21b077b2839fbcd977d5e5cf7135e4a6af762f6a2f063d649dfd88cf2ce5c6be7c21713144f487b1394d9131f04 SHA512 e2067e5c491a447341a4f73578cc540cac07855693cbc31a26cf55f18e39fe808a29217a523a38a385bce6b8fb9b7c5e1bde1f636f0db3bfeb31b6d95fe5ff36
+EBUILD synapse-1.107.0.ebuild 6082 BLAKE2B 167592d6134d5ed7a77b02439665e7ab750fe30957fa186fb6f0c151ca00820024003bad000198c6effdd6017e83360f963f615facd0033cd7b0e6f1203e8b45 SHA512 a1496495fe5159ca7a6c48cb69d1d17b9d709fb1098822fbb95479007354639f352f147897c6a654f59fbae407a8220b015df08c06dc4bd3f1a1c290090ac724
 MISC metadata.xml 381 BLAKE2B 8bf85af089213456d20c9d66a4d9788ff209983f8fd98c9fb6cf03e03ab5c12c9d5518ff4d86f5d4fb2a9a1080516f1febfedf5b06b0cb8e101cdc035bb139f4 SHA512 e88fd7f735bc9ca0aced01f49ca539134b297a5c9c5ee633fe3de64626d6f4b4eb547326288abea9c161f2647852c23658dba17265e64254335870450f644307
diff --git a/net-im/synapse/synapse-1.107.0.ebuild b/net-im/synapse/synapse-1.107.0.ebuild
new file mode 100644
index 000000000000..53b7ad2fee87
--- /dev/null
+++ b/net-im/synapse/synapse-1.107.0.ebuild
@@ -0,0 +1,237 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_EXT=1
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{10..12} )
+
+CRATES="
+	aho-corasick@1.0.2
+	anyhow@1.0.82
+	arc-swap@1.5.1
+	autocfg@1.1.0
+	base64@0.21.7
+	bitflags@1.3.2
+	blake2@0.10.6
+	block-buffer@0.10.3
+	bumpalo@3.16.0
+	bytes@1.6.0
+	cfg-if@1.0.0
+	cpufeatures@0.2.12
+	crypto-common@0.1.6
+	digest@0.10.7
+	fnv@1.0.7
+	generic-array@0.14.6
+	getrandom@0.2.14
+	headers-core@0.3.0
+	headers@0.4.0
+	heck@0.4.1
+	hex@0.4.3
+	http@1.1.0
+	httpdate@1.0.3
+	indoc@2.0.4
+	itoa@1.0.4
+	js-sys@0.3.69
+	lazy_static@1.4.0
+	libc@0.2.153
+	lock_api@0.4.9
+	log@0.4.21
+	memchr@2.6.3
+	memoffset@0.9.0
+	mime@0.3.17
+	once_cell@1.15.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.3
+	portable-atomic@1.6.0
+	ppv-lite86@0.2.17
+	proc-macro2@1.0.76
+	pyo3-build-config@0.20.3
+	pyo3-ffi@0.20.3
+	pyo3-log@0.9.0
+	pyo3-macros-backend@0.20.3
+	pyo3-macros@0.20.3
+	pyo3@0.20.3
+	pythonize@0.20.0
+	quote@1.0.35
+	rand@0.8.5
+	rand_chacha@0.3.1
+	rand_core@0.6.4
+	redox_syscall@0.2.16
+	regex-automata@0.4.4
+	regex-syntax@0.8.2
+	regex@1.10.4
+	ryu@1.0.11
+	scopeguard@1.1.0
+	serde@1.0.200
+	serde_derive@1.0.200
+	serde_json@1.0.116
+	sha1@0.10.5
+	sha2@0.10.8
+	smallvec@1.10.0
+	subtle@2.4.1
+	syn@2.0.48
+	target-lexicon@0.12.4
+	typenum@1.15.0
+	ulid@1.1.2
+	unicode-ident@1.0.5
+	unindent@0.2.3
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.92
+	wasm-bindgen-macro-support@0.2.92
+	wasm-bindgen-macro@0.2.92
+	wasm-bindgen-shared@0.2.92
+	wasm-bindgen@0.2.92
+	web-time@1.1.0
+	windows-sys@0.36.1
+	windows_aarch64_msvc@0.36.1
+	windows_i686_gnu@0.36.1
+	windows_i686_msvc@0.36.1
+	windows_x86_64_gnu@0.36.1
+	windows_x86_64_msvc@0.36.1
+"
+
+inherit cargo distutils-r1 multiprocessing optfeature systemd
+
+DESCRIPTION="Reference implementation of Matrix homeserver"
+HOMEPAGE="
+	https://matrix.org/
+	https://github.com/element-hq/synapse
+"
+SRC_URI="
+	https://github.com/element-hq/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="AGPL-3+"
+# Dependent crate licenses
+LICENSE+="
+	Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+IUSE="postgres systemd test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/synapse
+	acct-group/synapse
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	>=dev-python/canonicaljson-2[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/ijson[${PYTHON_USEDEP}]
+	dev-python/immutabledict[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	>=dev-python/matrix-common-1.3.0[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/phonenumbers[${PYTHON_USEDEP}]
+	>=dev-python/pillow-10.0.1[${PYTHON_USEDEP},webp]
+	dev-python/prometheus-client[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/pydantic[${PYTHON_USEDEP}]
+	dev-python/pymacaroons[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/service-identity[${PYTHON_USEDEP}]
+	dev-python/signedjson[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+	dev-python/treq[${PYTHON_USEDEP}]
+	dev-python/twisted[${PYTHON_USEDEP}]
+	dev-python/typing-extensions[${PYTHON_USEDEP}]
+	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hiredis[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/pyicu[${PYTHON_USEDEP}]
+		dev-python/txredisapi[${PYTHON_USEDEP}]
+		postgres? ( dev-db/postgresql[server] )
+	)
+"
+
+# Rust extension
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
+
+src_test() {
+	if use postgres; then
+		einfo "Preparing postgres test instance"
+		initdb --pgdata="${T}/pgsql" || die
+		pg_ctl --wait --pgdata="${T}/pgsql" start \
+			--options="-h '' -k '${T}'" || die
+		createdb --host="${T}" synapse_test || die
+
+		# See https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#running-tests-under-postgresql
+		local -x SYNAPSE_POSTGRES=1
+		local -x SYNAPSE_POSTGRES_HOST="${T}"
+	fi
+
+	# This remove is necessary otherwise python is not able to locate
+	# synapse_rust.abi3.so.
+	rm -rf synapse || die
+
+	nonfatal distutils-r1_src_test
+	local ret=${?}
+
+	if use postgres; then
+		einfo "Stopping postgres test instance"
+		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+	fi
+
+	[[ ${ret} -ne 0 ]] && die
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests
+}
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/{lib,log}/synapse /etc/synapse
+	fowners synapse:synapse /var/{lib,log}/synapse /etc/synapse
+	fperms 0750 /var/{lib,log}/synapse /etc/synapse
+	newinitd "${FILESDIR}/${PN}.initd-r1" "${PN}"
+	systemd_dounit "${FILESDIR}/synapse.service"
+}
+
+pkg_postinst() {
+	optfeature "Improve user search for international display names" dev-python/pyicu
+	optfeature "Redis support" dev-python/txredisapi
+	optfeature "VoIP relaying on your homeserver with turn" net-im/coturn
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		einfo
+		elog "In order to generate initial configuration run:"
+		elog "sudo -u synapse synapse_homeserver \\"
+		elog "    --server-name matrix.domain.tld \\"
+		elog "    --config-path /etc/synapse/homeserver.yaml \\"
+		elog "    --generate-config \\"
+		elog "    --data-directory /var/lib/synapse \\"
+		elog "    --report-stats=no"
+		einfo
+	else
+		einfo
+		elog "Please refer to upgrade notes if any special steps are required"
+		elog "to upgrade from the version you currently have installed:"
+		elog
+		elog "  https://github.com/element-hq/synapse/blob/develop/docs/upgrade.md"
+		einfo
+	fi
+}
diff --git a/net-im/telegram-desktop/Manifest b/net-im/telegram-desktop/Manifest
index 8ea5d0f429c6..9a5d016eb20f 100644
--- a/net-im/telegram-desktop/Manifest
+++ b/net-im/telegram-desktop/Manifest
@@ -1,12 +1,9 @@
 AUX tdesktop-4.10.0-system-cppgir.patch 1150 BLAKE2B d8a6e1320c2ccfd4f1c3f63bfda11f58a499df3880f262adf3f1b74f217dc8c4cc62a8c250d71ff809fb67c797948b53fac5a4d5c584a116b1609ea432662d73 SHA512 0fd213f9aec3a6ff9be11654934126960309cb8e1241dd694852bffeb7a37a08d3c78a332a5bb7e6529358df69bfddb7ccb58138e6dc331f20dd5337ddc9a1c1
 AUX tdesktop-4.10.5-qt_compare.patch 381 BLAKE2B 5a5ceea9163f5c2a4cda0df5d10e4013a9634e11a3a3694e1d09166ec311c1089f75b48fa6d618965b722daae40d1f297484ea954341ef8420c7259425eb0ef8 SHA512 d37fea06e9178c778560d2f46b2953794b1605635bdcbf1343a5077c1270d7ec56e5cbb00bdf6caf7eafe21a3c44faa719b9376b8d317d2a109308107fae4226
 AUX tdesktop-4.2.4-jemalloc-only-telegram-r1.patch 1307 BLAKE2B b27f65973a6fa8c83469e0c6419a600ca04ebbf35f6c4a406129867eee644082c4f0164fb71afbc6ae729bb4037d0cf6c68ea1ad78f6268bfe245b83e4290400 SHA512 d2c33dd18e354ebe6cb7143b58e9f61dc4cd664bb1e7ad9c60f562efbb05cc72d5b36270af96b866583b366b59cc34cadee3a62dcbd40433276b80b2511e1fcb
+AUX tdesktop-5.0.1-qt6-no-wayland.patch 4071 BLAKE2B 941a0b874ecd5983179586c796990e23548c117a200c0a2ad714046ee6ccfccf9f5427b0a6452517007a1c2569c79cb9728dc056a2559aaacf648081f141b50a SHA512 5e3ce484290d46e9460ace719abc5afb6a33c4c0d4ec4647d3428a31d6b6f7aafead59ee3219e0083ead567467a078ed0aa011d4243fce82636a7319e83430d2
 DIST tdesktop-4.15.0-full.tar.gz 68286818 BLAKE2B 2bd4d59370a4f97aa3c1b1d64fa7eea114539edcff46ea30a5361cefeeb1de8a1954be91a1a420ddc1b1a30970944387c2cd3749badaa494e53862066c624ac3 SHA512 95aa5f14a9a88b9c6421049445f59f1c5c5d7ab4ca4e8b8f4ab7389bdb8f3cc6b29fea270574881633035acec769ba271261f84ec269010c63af28a03719da98
-DIST tdesktop-4.15.2-full.tar.gz 69539402 BLAKE2B 95d6cd3eead56f7cb2aeafd0cc1a05d740ec243644e6d318f415a7fa6c8ad94d3a95cfc9082ba04507a024c81bfc15700ad6adcbfd932ca1993a3310744ac196 SHA512 6e65183d5e77d17e11d0c70e1654373e69f6243f2879cf403701e23acd5aed9df6c6892a1c7c83fd975a858e90e20d73824d0754a2f96ad5af6e3de6515e2627
-DIST tdesktop-4.16.8-full.tar.gz 70436084 BLAKE2B 5e64372de39a94b2fb7d4b0b8cb4896e9f4bb9eb1421898f30b686a6ce02141cebc42e2be280107ccbbda771f868de365267248dbdab393d88e204fa197f5e3d SHA512 7d9d8ab4c62cf9e4f44ff879953f3d543427f7fd80682f6d08b58fb3dec481b0082086c3958e38b809b886359a76b1f5450142dbcfb58c867014d78f5fa19f60
-DIST tdesktop-5.0.0-full.tar.gz 69454950 BLAKE2B 3bea8eb50cc5a86b12cbc8a1e6ccd537be7ecc0b90427a4325ee8e9b18469575c0026763e469241f0c71f0e9f0a1be799dfadc62d4177a00d804845c81fae1cc SHA512 9e674cf8b8bbb94cc7bd0fd9493c435f25314a317086e8c102fe0309bdcd5805b605257883831eb8548825597aab5b9f8f0b5074689b630b63f301506402323d
+DIST tdesktop-5.0.1-full.tar.gz 69454563 BLAKE2B 0bbb0ee0c096a344b00091795c2bfadd71272b01966daed8f44fd7010c4c4ecfb265c80ecd773934dd0636be1e703bbadc0038befdefd6da93dfadea40e53fba SHA512 45b7833f20f01d78c09163e205af7d68afffcfc88075ba6af35dc6cbbce1f0205c0150b137ca09e6bdaf271240e4d1336411ad427bc27a2b2ad42dc435ee0ec2
 EBUILD telegram-desktop-4.15.0-r2.ebuild 7396 BLAKE2B f869a09a351aed1d0a9f9978085b2999f5e4150a124d117dc281dce0bd7e0537eed3b6c380ff5c7ebfdd842b54f9dbd6add2fc345ff8e45cfc91d2d842e2618e SHA512 6c4f6571992d97fc4cc54cf4db03ad376affc61a78f137f9a9ca59ab3c44af2a5155261bb523bbfd5ea117b7bd9a99adb649639f20772b2293d73d2611db26b0
-EBUILD telegram-desktop-4.15.2-r1.ebuild 7397 BLAKE2B 80f9511ffdd2c5827bc00ce5574bc0af59d299d1bc2d09953c3736f4a873513d94d4b65ee523af84b5c60b876013b07277d8eeed13dd00d0f9a051b90c9495d7 SHA512 3092a3e3d6dedcd5b32046573e36894a80da73ab251394e6ece32a8f4a23fa6369b4282a04eb18270f6be22de084e13cf5bd3012f695044330ca62be90ea4a0c
-EBUILD telegram-desktop-4.16.8.ebuild 7870 BLAKE2B b5e806de593763d87959d1ce775433e6c070a83c46d4e1e9d16230fc2ff6c1abf8f4da83a226c9e241006d989822687aa6cae14533bfcaf7f38801804bbd3e74 SHA512 86207eaaa1222a6538a20506034178f662cb1cb748bb3d097d72ffb026223e46b4e9e641249f29d34835b4c72be6128bd6fb7407a8b5b4ef79fea2f7b31794eb
-EBUILD telegram-desktop-5.0.0.ebuild 7870 BLAKE2B b5e806de593763d87959d1ce775433e6c070a83c46d4e1e9d16230fc2ff6c1abf8f4da83a226c9e241006d989822687aa6cae14533bfcaf7f38801804bbd3e74 SHA512 86207eaaa1222a6538a20506034178f662cb1cb748bb3d097d72ffb026223e46b4e9e641249f29d34835b4c72be6128bd6fb7407a8b5b4ef79fea2f7b31794eb
+EBUILD telegram-desktop-5.0.1.ebuild 8060 BLAKE2B 088de521ebe31c3cea5b54c9839411d144cb3c678166ad1d604750a6c1c12ee845cebb50aa5d55b7e99903a34a75ba32d2ab3d15cb9cd35ebd0dfe12e478284d SHA512 a9c61e090497346b7dac7b7c819ed39fd01452079b14ef5bb5a2871818bb2315fbc5370cdd65c88fe7ce9b3dbd07d9df80c8c7bcf8043c078bca23f55316e649
 MISC metadata.xml 1307 BLAKE2B 13008e6d601f7e537bbfa6c65091f442a68320858ec0f1433f31ef69890dbdd730464a1e9d5dfc125982895a4fdfaa48edb643670fffba538dcdd44ceffa9cf4 SHA512 a7e0db84964fd04ab37641a23d9b722191d1c5731b946d7e4859c6b0dd2f5a53eadb88297fd24dadd66c5ee097aa0622adafae74d8819e940b1aa9e612ab1e38
diff --git a/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch b/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch
new file mode 100644
index 000000000000..10a8743a0d31
--- /dev/null
+++ b/net-im/telegram-desktop/files/tdesktop-5.0.1-qt6-no-wayland.patch
@@ -0,0 +1,95 @@
+Allow disabling wayland integration for Qt6 builds
+
+Upstream has removed the required toggle for wayland integration, and instead
+is forcing it when the program is being built with Qt6 version 6.5.0 or higher.
+
+Currently this is simple to work around, but its future feasibility remains to
+be seen, depending on what upstream thinks about this.
+
+https://bugs.gentoo.org/928451
+https://github.com/desktop-app/cmake_helpers/commit/a428df5440e76a726abc30924766ac7da0cb381c
+
+--- tdesktop-5.0.1-full.orig/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
++++ tdesktop-5.0.1-full/Telegram/lib_base/base/platform/linux/base_linux_xdg_activation_token.cpp
+@@ -15,7 +15,7 @@
+ namespace base::Platform {
+ 
+ void RunWithXdgActivationToken(Fn<void(QString)> callback) {
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ 	const auto window = QGuiApplication::focusWindow();
+ 	if (!window) {
+ 		callback({});
+--- tdesktop-5.0.1-full.orig/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
++++ tdesktop-5.0.1-full/Telegram/lib_ui/ui/platform/linux/ui_utility_linux.cpp
+@@ -413,7 +413,7 @@
+ }
+ #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION
+ 
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if !defined DESKTOP_APP_DISABLE_X11_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ void ShowWaylandWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
+ 	static const auto wl_proxy_marshal_array = [] {
+ 		void (*result)(
+@@ -533,7 +533,7 @@
+ }
+ 
+ bool WindowMarginsSupported() {
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ 	static const auto WaylandResult = [] {
+ 		using namespace QNativeInterface::Private;
+ 		QWindow window;
+@@ -560,7 +560,7 @@
+ }
+ 
+ void SetWindowMargins(not_null<QWidget*> widget, const QMargins &margins) {
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ 	using namespace QNativeInterface::Private;
+ 	const auto window = not_null(widget->windowHandle());
+ 	const auto platformWindow = not_null(window->handle());
+@@ -582,7 +582,7 @@
+ }
+ 
+ void UnsetWindowMargins(not_null<QWidget*> widget) {
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ 	using namespace QNativeInterface::Private;
+ 	if (const auto native = not_null(widget->windowHandle())
+ 			->nativeInterface<QWaylandWindow>()) {
+@@ -600,7 +600,7 @@
+ }
+ 
+ void ShowWindowMenu(not_null<QWidget*> widget, const QPoint &point) {
+-#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
++#if !defined DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION && QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+ 	if (::Platform::IsWayland()) {
+ 		ShowWaylandWindowMenu(widget, point);
+ 		return;
+--- tdesktop-5.0.1-full.orig/cmake/options.cmake
++++ tdesktop-5.0.1-full/cmake/options.cmake
+@@ -23,6 +23,13 @@
+     )
+ endif()
+ 
++if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
++    target_compile_definitions(common_options
++    INTERFACE
++        DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
++    )
++endif()
++
+ if (WIN32)
+     include(cmake/options_win.cmake)
+ elseif (APPLE)
+--- tdesktop-5.0.1-full.orig/cmake/variables.cmake
++++ tdesktop-5.0.1-full/cmake/variables.cmake
+@@ -21,6 +21,7 @@
+ 
+ option(DESKTOP_APP_LOTTIE_USE_CACHE "Use caching in lottie animations." ON)
+ cmake_dependent_option(DESKTOP_APP_DISABLE_X11_INTEGRATION "Disable all code for X11 integration." OFF LINUX ON)
++cmake_dependent_option(DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION "Disable all code for Wayland integration." OFF LINUX ON)
+ cmake_dependent_option(DESKTOP_APP_USE_ALLOCATION_TRACER "Use simple allocation tracer." OFF LINUX OFF)
+ cmake_dependent_option(DESKTOP_APP_USE_PACKAGED_LAZY "Bundle recommended Qt plugins for self-contained packages." OFF LINUX OFF)
+ option(DESKTOP_APP_USE_PACKAGED_FONTS "Use preinstalled fonts instead of bundled patched ones." OFF)
diff --git a/net-im/telegram-desktop/telegram-desktop-4.15.2-r1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.15.2-r1.ebuild
deleted file mode 100644
index a33208b90fa5..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-4.15.2-r1.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..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 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="dbus enchant +fonts screencast qt6 qt6-imageformats wayland webkit +X"
-REQUIRED_USE="
-	qt6-imageformats? ( qt6 )
-"
-
-KIMAGEFORMATS_RDEPEND="
-	media-libs/libavif:=
-	media-libs/libheif:=
-	>=media-libs/libjxl-0.8.0:=
-"
-CDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	>=dev-cpp/glibmm-2.77:2.68
-	dev-libs/glib:2
-	dev-libs/libdispatch
-	dev-libs/openssl:=
-	dev-libs/protobuf
-	dev-libs/xxhash
-	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_pre20230921:=[screencast=,X=]
-	media-video/ffmpeg:=[opus,vpx]
-	sys-libs/zlib:=[minizip]
-	!enchant? ( >=app-text/hunspell-1.7:= )
-	enchant? ( app-text/enchant:= )
-	!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:5
-		webkit? (
-			>=dev-qt/qtdeclarative-5.15:5
-			>=dev-qt/qtwayland-5.15:5
-		)
-	)
-	qt6? (
-		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
-		>=dev-qt/qtimageformats-6.5:6
-		>=dev-qt/qtsvg-6.5:6
-		webkit? (
-			>=dev-qt/qtdeclarative-6.5:6
-			>=dev-qt/qtwayland-6.5:6[compositor]
-		)
-		qt6-imageformats? (
-			>=dev-qt/qtimageformats-6.5:6=
-			${KIMAGEFORMATS_RDEPEND}
-		)
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-keysyms
-	)
-"
-RDEPEND="${CDEPEND}
-	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
-"
-DEPEND="${CDEPEND}
-	>=dev-cpp/cppgir-0_p20240110
-	>=dev-cpp/ms-gsl-4
-	dev-cpp/expected-lite
-	dev-cpp/range-v3
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/cmake-3.16
-	>=dev-cpp/cppgir-0_p20230926
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch"
-	"${FILESDIR}/tdesktop-4.10.5-qt_compare.patch"
-)
-
-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
-}
-
-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.
-
-	# Happily fail if libraries aren't found...
-	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
-		\! -path './Telegram/lib_webview/CMakeLists.txt' \
-		\! -path './cmake/external/expected/CMakeLists.txt' \
-		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
-		\! -path './cmake/external/qt/package.cmake' \
-		-print0 | xargs -0 sed -i \
-		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
-		-e '/find_package(/s/)/ REQUIRED)/' || die
-	# Make sure to check the excluded files for new
-	# CMAKE_DISABLE_FIND_PACKAGE entries.
-
-	# Control QtDBus dependency from here, to avoid messing with QtGui.
-	if ! use dbus; then
-		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
-			-i cmake/external/qt/package.cmake || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Having user paths sneak into the build environment through the
-	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
-	# - bug 909038: can't read from flatpak directories (fixed upstream)
-	# - bug 920819: system-wide directories ignored when variable is set
-	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
-
-	# Evil flag (bug #919201)
-	filter-flags -fno-delete-null-pointer-checks
-
-	# 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 qt=$(usex qt6 6 5)
-	local mycmakeargs=(
-		-DQT_VERSION_MAJOR=${qt}
-
-		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
-		# Upstream never tests this any other way
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
-
-		# Control automagic dependencies on certain packages
-		## Header-only lib, some git version.
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
-		## Only used in Telegram/lib_webview/CMakeLists.txt
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit)
-		## KF6CoreAddons is currently unavailable in ::gentoo
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		## Enables enchant and disables hunspell
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
-		## Use system fonts instead of bundled ones
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
-	)
-
-	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 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
-	if ! use qt6; then
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-5.0.0.ebuild b/net-im/telegram-desktop/telegram-desktop-5.0.0.ebuild
deleted file mode 100644
index 96d25257595e..000000000000
--- a/net-im/telegram-desktop/telegram-desktop-5.0.0.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..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 ~arm64 ~loong ~ppc64 ~riscv"
-IUSE="dbus enchant +fonts +jemalloc screencast qt6 qt6-imageformats wayland webkit +X"
-REQUIRED_USE="
-	qt6-imageformats? ( qt6 )
-"
-
-KIMAGEFORMATS_RDEPEND="
-	media-libs/libavif:=
-	media-libs/libheif:=
-	>=media-libs/libjxl-0.8.0:=
-"
-CDEPEND="
-	!net-im/telegram-desktop-bin
-	app-arch/lz4:=
-	dev-cpp/abseil-cpp:=
-	>=dev-cpp/glibmm-2.77:2.68
-	dev-libs/glib:2
-	dev-libs/libdispatch
-	dev-libs/openssl:=
-	dev-libs/protobuf
-	dev-libs/xxhash
-	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_pre20230921:=[screencast=,X=]
-	media-video/ffmpeg:=[opus,vpx]
-	sys-libs/zlib:=[minizip]
-	!enchant? ( >=app-text/hunspell-1.7:= )
-	enchant? ( app-text/enchant:= )
-	jemalloc? ( dev-libs/jemalloc:= )
-	!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:5
-		webkit? (
-			>=dev-qt/qtdeclarative-5.15:5
-			>=dev-qt/qtwayland-5.15:5
-		)
-	)
-	qt6? (
-		>=dev-qt/qtbase-6.5:6=[dbus?,gui,network,opengl,wayland?,widgets,X?]
-		>=dev-qt/qtimageformats-6.5:6
-		>=dev-qt/qtsvg-6.5:6
-		webkit? (
-			>=dev-qt/qtdeclarative-6.5:6
-			>=dev-qt/qtwayland-6.5:6[compositor]
-		)
-		qt6-imageformats? (
-			>=dev-qt/qtimageformats-6.5:6=
-			${KIMAGEFORMATS_RDEPEND}
-		)
-	)
-	X? (
-		x11-libs/libxcb:=
-		x11-libs/xcb-util-keysyms
-	)
-"
-RDEPEND="${CDEPEND}
-	webkit? ( || ( net-libs/webkit-gtk:4.1 net-libs/webkit-gtk:6 ) )
-"
-DEPEND="${CDEPEND}
-	>=dev-cpp/cppgir-2.0_p20240315
-	>=dev-cpp/ms-gsl-4
-	dev-cpp/expected-lite
-	dev-cpp/range-v3
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-build/cmake-3.16
-	>=dev-cpp/cppgir-2.0_p20240315
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
-	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
-	"${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch"
-)
-
-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
-}
-
-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.
-
-	# Happily fail if libraries aren't found...
-	find -type f \( -name 'CMakeLists.txt' -o -name '*.cmake' \) \
-		\! -path './Telegram/lib_webview/CMakeLists.txt' \
-		\! -path './cmake/external/expected/CMakeLists.txt' \
-		\! -path './cmake/external/kcoreaddons/CMakeLists.txt' \
-		\! -path './cmake/external/qt/package.cmake' \
-		-print0 | xargs -0 sed -i \
-		-e '/pkg_check_modules(/s/[^ ]*)/REQUIRED &/' \
-		-e '/find_package(/s/)/ REQUIRED)/' || die
-	# Make sure to check the excluded files for new
-	# CMAKE_DISABLE_FIND_PACKAGE entries.
-
-	# Control QtDBus dependency from here, to avoid messing with QtGui.
-	if ! use dbus; then
-		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
-			-i cmake/external/qt/package.cmake || die
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# Having user paths sneak into the build environment through the
-	# XDG_DATA_DIRS variable causes all sorts of weirdness with cppgir:
-	# - bug 909038: can't read from flatpak directories (fixed upstream)
-	# - bug 920819: system-wide directories ignored when variable is set
-	export XDG_DATA_DIRS="${EPREFIX}/usr/share"
-
-	# Evil flag (bug #919201)
-	filter-flags -fno-delete-null-pointer-checks
-
-	# 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 qt=$(usex qt6 6 5)
-	local mycmakeargs=(
-		-DQT_VERSION_MAJOR=${qt}
-
-		# Override new cmake.eclass defaults (https://bugs.gentoo.org/921939)
-		# Upstream never tests this any other way
-		-DCMAKE_DISABLE_PRECOMPILE_HEADERS=OFF
-
-		# Control automagic dependencies on certain packages
-		## Header-only lib, some git version.
-		-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}Quick=$(usex !webkit)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}QuickWidgets=$(usex !webkit)
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandClient=$(usex !wayland)
-		## Only used in Telegram/lib_webview/CMakeLists.txt
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt${qt}WaylandCompositor=$(usex !webkit)
-		## KF6CoreAddons is currently unavailable in ::gentoo
-		-DCMAKE_DISABLE_FIND_PACKAGE_KF${qt}CoreAddons=$(usex qt6)
-
-		-DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)
-		-DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=$(usex !wayland)
-		-DDESKTOP_APP_DISABLE_JEMALLOC=$(usex !jemalloc)
-		## Enables enchant and disables hunspell
-		-DDESKTOP_APP_USE_ENCHANT=$(usex enchant)
-		## Use system fonts instead of bundled ones
-		-DDESKTOP_APP_USE_PACKAGED_FONTS=$(usex !fonts)
-	)
-
-	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 ! 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 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
-	if ! use qt6; then
-		optfeature "AVIF, HEIF and JpegXL image support" kde-frameworks/kimageformats[avif,heif,jpegxl]
-	fi
-}
diff --git a/net-im/telegram-desktop/telegram-desktop-4.16.8.ebuild b/net-im/telegram-desktop/telegram-desktop-5.0.1.ebuild
index 96d25257595e..0dfe60495f3e 100644
--- a/net-im/telegram-desktop/telegram-desktop-4.16.8.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-5.0.1.ebuild
@@ -58,7 +58,7 @@ CDEPEND="
 		kde-frameworks/kcoreaddons:5
 		webkit? (
 			>=dev-qt/qtdeclarative-5.15:5
-			>=dev-qt/qtwayland-5.15:5
+			>=dev-qt/qtwayland-5.15:5[compositor(+)]
 		)
 	)
 	qt6? (
@@ -67,7 +67,7 @@ CDEPEND="
 		>=dev-qt/qtsvg-6.5:6
 		webkit? (
 			>=dev-qt/qtdeclarative-6.5:6
-			>=dev-qt/qtwayland-6.5:6[compositor]
+			>=dev-qt/qtwayland-6.5:6[compositor,qml]
 		)
 		qt6-imageformats? (
 			>=dev-qt/qtimageformats-6.5:6=
@@ -100,6 +100,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram-r1.patch"
 	"${FILESDIR}/tdesktop-4.10.0-system-cppgir.patch"
+	"${FILESDIR}/tdesktop-5.0.1-qt6-no-wayland.patch"
 )
 
 pkg_pretend() {
@@ -138,6 +139,8 @@ src_prepare() {
 	# CMAKE_DISABLE_FIND_PACKAGE entries.
 
 	# Control QtDBus dependency from here, to avoid messing with QtGui.
+	# QtGui will use find_package to find QtDbus as well, which
+	# conflicts with the -DCMAKE_DISABLE_FIND_PACKAGE method.
 	if ! use dbus; then
 		sed -e '/find_package(Qt[^ ]* OPTIONAL_COMPONENTS/s/DBus *//' \
 			-i cmake/external/qt/package.cmake || die