gentoo auto-resync : 06:03:2024 - 19:06:26

9 files changed, 269 insertions, 186 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 476af785ee8f..73233227b5c0 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index b2c9200d8487..7fd476a31f87 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -1,3 +1,4 @@
+AUX synapse-1.101.0-netaddr-tests.patch 1504 BLAKE2B 6c118e7436cf5248a3f3170ff4a84ebbfda11c0fb6279084abe2ebd20a8bf5ed0455b41b3d3bcb30f1061a233a9e7dbccffd8294f72faaf00d59bd421fa6992d SHA512 baf6f70b5f36eabe737835080b151c44b5c02c0fde209d569f82abd6fbac2ec7201bed7c0d7db5920fdda8bcfcb406fc1a35f2613fd018cc54a15f2964aee7e5
 AUX synapse.initd-r1 345 BLAKE2B bc4868eff0103c657725b077a5f9ad002300b34a1a8bb85820c3c12b9da733fb33ef136a3a992cfe50844cba304cfaa8f9577e4f5fdcc9e94f653406043ad663 SHA512 44a0f7124f8730b4fc8f0e52284d8f03a0bf016c584fa0411910f66d236e3130b1c749d45ff84fa3a8619716bb973ff51f0a5733b06006640894eb39f29d188e
 AUX synapse.service 549 BLAKE2B 4b91a2da29b2a9afc5a6cff3c74a8b2f0dbe86063d0a47e60fddf8eb712b3642c308181ba2444a7e59b58f942368e7217dc94088a2487816aa44e28f49094573 SHA512 a9039c2883008c191cc89bec6f52893b489688e83525eeef09a979fc22b09b048cd03d6a7a450ac3d1441abccdcd6786cfd6c8f0b90ea98d1516c312bf634636
 DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b
@@ -65,6 +66,7 @@ DIST syn-2.0.28.crate 241635 BLAKE2B 5784468a0dd04eb298821ae5a3facf72c5fe5907cc4
 DIST syn-2.0.48.crate 250566 BLAKE2B e46b0863af76c3116c84d01b654a9820b7edc51f75c9c5301a7967d12284f78da602409f34fc40524728350dc6b998a4d738f08b8868f95236b3e5d24c460580 SHA512 926c0ad55cc743df20f9166b6d71fd44421aeb1f073fd86b6ddb53e13cd508b539c0360ce64b07b65597bb14639c8f33acf7e60951e1e9128624517aa3aee325
 DIST synapse-1.100.0.gh.tar.gz 8465610 BLAKE2B 02500ba7ec2da0bcb364e0a3d63efa2520c1050db2af023398ae00851d1975c989f0a1f84afbbdf3275b3aafaca27ce4614c18ecb29eaab093253bc9f99a20c7 SHA512 a426892a3802ab910cf823fc6a124f39431a1fbf6b0a52fb2ea3fedb146b00d1076633fafe8da291c211dbb667beac56bc80c3b06a2cce7896dbbf8df373c1e6
 DIST synapse-1.101.0.gh.tar.gz 8465894 BLAKE2B 91b6d0a3d494b7246cec7821e15bf850fa4f0d6e17e6d3bbfb1f0f7d9c0822a0e3e33836fb04f479ce2a280f56a8783e455636e1c2b67018a5d4959354998e3d SHA512 4f73aa725d2cb843442dbec858afe74e6fe93d838af4524d7731ad608fe05ea14e36f5844ae32a775becad4b9490c5ba02cfc446c39a043adb7eac9c72fa78ac
+DIST synapse-1.102.0.gh.tar.gz 8469024 BLAKE2B eaf50330d66149c757ab25811aa7017f8177ec5a3050e9c6dd2c8562f0c61e12ef5e7a08cfbac283c11cbadbc9f9adf58bd3934aa7bd4934fe2d4490759aa021 SHA512 420567482b3ab5d182506102a7817a487722f6bdd83bce57bb29ab11e1b07788cf4cf95913d16334637c7d388d9ba8b42d067a89ed9a403d606b6760377ec33b
 DIST synapse-1.99.0.gh.tar.gz 8453977 BLAKE2B 6f8b43a22e693fbdcceb0819d9ee79930712dda9ef6ff2d9d9c884fd9cc778bfd5771d7267274af10387f35495a972432c19e34c1727578a78ac42360fe79b9a SHA512 e3e3c30781a52013d2b0f762ee9d4af3660976338fe72a761c8c77196f5e1a9f086c3b2b0ab6f467e4b0aa54a65572040e6f4ee493993edceffe7d1dde3830ff
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
@@ -77,7 +79,8 @@ DIST windows_i686_gnu-0.36.1.crate 818115 BLAKE2B fdb78cf88e1049d1ed6c474f870dfd
 DIST windows_i686_msvc-0.36.1.crate 724575 BLAKE2B cf964bec007d8432e2009644cf7f89ea7d910ccf9512c067b7bf5c6c825208ce4a36e9864c0cbca137f523983eb46e58e4bd01054cecd7ac7126d2ba9f67ac0c SHA512 02bb1507981229422498ce29f6c777d5e412358040128f84b09d948ccddf0461b078a0a20cc7f6ab7da8595121bb369453ae9ea1f0506aab715662e8c631e737
 DIST windows_x86_64_gnu-0.36.1.crate 790934 BLAKE2B 9dec5d966bdc89efbc81989acca242d519f51676ec37487df2bfacd6bfbc5a8de2871be72c5b96a073a899c666e3a39aa60d493e7df39fa90efe869fb744a332 SHA512 598b69e4f2cd3d68f910d526a66dadb465ff30a8c261c9a4455aa1c5b952d23c04f8edaa063cd16fb43564c116a13f06d607f3a0a9c7495054b8bfe1c04d1865
 DIST windows_x86_64_msvc-0.36.1.crate 661999 BLAKE2B 4cf967f10d4ce148bac967598168752d1996b4ddf5278a8fca53360566c37c1a014bfb4dfdc0ae2d96e01196c42eb4906ea80d8e9dd23b9e9f3163631c9e253e SHA512 89c22ed51a74f531662d80ae0fa5e0215728db1e6caf3c13eaeba95a93548b43c00b8474f52553ac866ac83c203b6c22dc44fbc870e882a4c9c97ba54b87c631
-EBUILD synapse-1.100.0.ebuild 5578 BLAKE2B d8a18f0d1ad3921b89cba39e60df2d16ba06788091ede0785e269a8b56777c438fe95c407c514b5e9756361b21bf14ec4b07a9703de17e8c9e48c661863e328e SHA512 78450c1128341c55a876a2e9195aed83c7220fa061d3eba2c095d3e1851180dd3d393c46b44ff6a8dd1337b90cdb02e40d28880b9dc6e69a9020244836d165f0
-EBUILD synapse-1.101.0.ebuild 5578 BLAKE2B 4e1c1e634619b10153e416000b5cffed8da9ff71d265c70423a614a3c64f1a8d82291209e8193b45d490558712d2d082f7f6723b3912a3bb8b89ad5d23c568a1 SHA512 74b72bf92761463b8300fea14122c08aee641dd6e0db81dfd3ec6897af761c6f6e6eef978b5c0c10e674181bfc4406cc2bba0c86e6a24c177fceb4290a985a8f
-EBUILD synapse-1.99.0.ebuild 5576 BLAKE2B 288139f3d066eda1666da949c9a2339ffa67932295958e81b498d1e3bcd53ea062a0f72fd503eb728c258946d44fa9fb7d302d3c319ec8ce728e09c903a6b166 SHA512 6b1400bf68c9e32b1f8d6fff54c19c301fe427757f9468d99d7863731a791a616b33fdfcdd71f398366fc94f97c403a5b8e193f96b0ed130df46c9d907f94f83
+EBUILD synapse-1.100.0.ebuild 5685 BLAKE2B 340f6f36823f94cf39e39959a7ff9d2f705b7d14659a68886ae6b12f3bf492f76590ffb84da7c4168e5c0287adcbfa135099f685c6664ef933684384a0fc7646 SHA512 c14117a72738db2a2d850e5558150bf18e1daea874f943e1a6e154a22b766929c65433cfa4da52bea5662fc263bbddea0bce00ddc53843d9b4187f846d88bbcf
+EBUILD synapse-1.101.0.ebuild 5676 BLAKE2B 96e4da15572e64e544e934c8fb7f5c26553a7230431cb0b4e65f3e07d017e54fb609ec12cd1c08693f1ed9f741bf8e431787c714c7d04b407ef9520517ae5164 SHA512 ff27b7d91f2ef23bec4cbc77b84141e7af35f92be205b24b88f19455e3745e9a51523ba60b96f58cda0f6faa6de57e5fc7b38d7bf6239b94e1d907fe41ffcad7
+EBUILD synapse-1.102.0.ebuild 5685 BLAKE2B 7099d408d0ab67195abcafb66e4c0007cc01cd50f661e8d4894c1a6579e10f402494ba57d339a9e539fadc02bf76196fb4363f41074f0c0f65733d2b23b273dd SHA512 72ccb14e10410270a38b3c2ff79d97002030d4d5c092b727ce25ccd80a613e370205588360f7400dd63b04332aca1320a3832b8b30737a5aabf6d222fa6d6d6f
+EBUILD synapse-1.99.0.ebuild 5683 BLAKE2B a57aff93d38f926162571ca8092fa9e8dd2718e37bf9abccf0b52ae2f99559cd145e2d15b2dfd0ab87890ebb5fca9641b8310cb2ca3ade027d882ba82708907c SHA512 08c5100a99fc048c842dbb6a3dab1dd97bb74151d095e95c6e59b31cffbf0aee3b63bedb6853de50b84ee6cf0c62c793979f226835564492db169025d797eb2d
 MISC metadata.xml 381 BLAKE2B 8bf85af089213456d20c9d66a4d9788ff209983f8fd98c9fb6cf03e03ab5c12c9d5518ff4d86f5d4fb2a9a1080516f1febfedf5b06b0cb8e101cdc035bb139f4 SHA512 e88fd7f735bc9ca0aced01f49ca539134b297a5c9c5ee633fe3de64626d6f4b4eb547326288abea9c161f2647852c23658dba17265e64254335870450f644307
diff --git a/net-im/synapse/files/synapse-1.101.0-netaddr-tests.patch b/net-im/synapse/files/synapse-1.101.0-netaddr-tests.patch
new file mode 100644
index 000000000000..ac8dcd6cd68f
--- /dev/null
+++ b/net-im/synapse/files/synapse-1.101.0-netaddr-tests.patch
@@ -0,0 +1,33 @@
+From 959bcf358cb988f242284afe61a1d99fa705150b Mon Sep 17 00:00:00 2001
+From: "Kai A. Hiller" <V02460@gmail.com>
+Date: Thu, 22 Feb 2024 20:52:27 +0100
+Subject: [PATCH] Specify IP subnet literals in canonical form
+
+This is needed, because the netaddr package removed support for the
+implicit prefix form in version 1.0.0:
+https://github.com/netaddr/netaddr/pull/360
+
+Upstream-PR: https://github.com/element-hq/synapse/pull/16953
+
+diff --git a/tests/api/test_auth.py b/tests/api/test_auth.py
+index ce85ddf22a..bd229cf7e9 100644
+--- a/tests/api/test_auth.py
++++ b/tests/api/test_auth.py
+@@ -128,7 +128,7 @@ def test_get_user_by_req_appservice_valid_token_good_ip(self) -> None:
+             token="foobar",
+             url="a_url",
+             sender=self.test_user,
+-            ip_range_whitelist=IPSet(["192.168/16"]),
++            ip_range_whitelist=IPSet(["192.168.0.0/16"]),
+         )
+         self.store.get_app_service_by_token = Mock(return_value=app_service)
+         self.store.get_user_by_access_token = AsyncMock(return_value=None)
+@@ -147,7 +147,7 @@ def test_get_user_by_req_appservice_valid_token_bad_ip(self) -> None:
+             token="foobar",
+             url="a_url",
+             sender=self.test_user,
+-            ip_range_whitelist=IPSet(["192.168/16"]),
++            ip_range_whitelist=IPSet(["192.168.0.0/16"]),
+         )
+         self.store.get_app_service_by_token = Mock(return_value=app_service)
+         self.store.get_user_by_access_token = AsyncMock(return_value=None)
diff --git a/net-im/synapse/synapse-1.100.0.ebuild b/net-im/synapse/synapse-1.100.0.ebuild
index 5ff5c92194aa..9a49db29ad94 100644
--- a/net-im/synapse/synapse-1.100.0.ebuild
+++ b/net-im/synapse/synapse-1.100.0.ebuild
@@ -140,6 +140,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# fix tests with >=dev-python/netaddr-1.0.0
+	"${FILESDIR}/${PN}-1.101.0-netaddr-tests.patch"
+)
+
 # Rust extension
 QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
 
diff --git a/net-im/synapse/synapse-1.101.0.ebuild b/net-im/synapse/synapse-1.101.0.ebuild
index bc63eedaa678..73bdacfc0959 100644
--- a/net-im/synapse/synapse-1.101.0.ebuild
+++ b/net-im/synapse/synapse-1.101.0.ebuild
@@ -140,6 +140,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# fix tests with >=dev-python/netaddr-1.0.0
+	"${FILESDIR}/${P}-netaddr-tests.patch"
+)
+
 # Rust extension
 QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
 
diff --git a/net-im/synapse/synapse-1.102.0.ebuild b/net-im/synapse/synapse-1.102.0.ebuild
new file mode 100644
index 000000000000..e81d65ecc3a2
--- /dev/null
+++ b/net-im/synapse/synapse-1.102.0.ebuild
@@ -0,0 +1,215 @@
+# 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.79
+	arc-swap@1.5.1
+	autocfg@1.1.0
+	bitflags@1.3.2
+	blake2@0.10.6
+	block-buffer@0.10.3
+	cfg-if@1.0.0
+	crypto-common@0.1.6
+	digest@0.10.5
+	generic-array@0.14.6
+	heck@0.4.1
+	hex@0.4.3
+	indoc@2.0.4
+	itoa@1.0.4
+	lazy_static@1.4.0
+	libc@0.2.135
+	lock_api@0.4.9
+	log@0.4.20
+	memchr@2.6.3
+	memoffset@0.9.0
+	once_cell@1.15.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.3
+	proc-macro2@1.0.76
+	pyo3-build-config@0.20.2
+	pyo3-ffi@0.20.2
+	pyo3-log@0.9.0
+	pyo3-macros-backend@0.20.2
+	pyo3-macros@0.20.2
+	pyo3@0.20.2
+	pythonize@0.20.0
+	quote@1.0.35
+	redox_syscall@0.2.16
+	regex-automata@0.4.4
+	regex-syntax@0.8.2
+	regex@1.10.3
+	ryu@1.0.11
+	scopeguard@1.1.0
+	serde@1.0.196
+	serde_derive@1.0.196
+	serde_json@1.0.113
+	smallvec@1.10.0
+	subtle@2.4.1
+	syn@2.0.48
+	target-lexicon@0.12.4
+	typenum@1.15.0
+	unicode-ident@1.0.5
+	unindent@0.2.3
+	version_check@0.9.4
+	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] )
+	)
+"
+
+PATCHES=(
+	# fix tests with >=dev-python/netaddr-1.0.0
+	"${FILESDIR}/${PN}-1.101.0-netaddr-tests.patch"
+)
+
+# 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/synapse/synapse-1.99.0.ebuild b/net-im/synapse/synapse-1.99.0.ebuild
index d224c35da010..231645a8542e 100644
--- a/net-im/synapse/synapse-1.99.0.ebuild
+++ b/net-im/synapse/synapse-1.99.0.ebuild
@@ -140,6 +140,11 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	# fix tests with >=dev-python/netaddr-1.0.0
+	"${FILESDIR}/${PN}-1.101.0-netaddr-tests.patch"
+)
+
 # Rust extension
 QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
 
diff --git a/net-im/zoom/Manifest b/net-im/zoom/Manifest
index 91206211a4e9..3b66b509c02b 100644
--- a/net-im/zoom/Manifest
+++ b/net-im/zoom/Manifest
@@ -1,9 +1,7 @@
 DIST zoom-5.16.10.668_x86_64.tar.xz 186935984 BLAKE2B ba1e7f4c82feb226367f3450f6410693a51a63ef02d1d799b378cd582925a0d653db5e9756def5c1a64db88f283c36007d52ecd222b11e9d8b12b75b5d40a370 SHA512 a2f770af9392614105ff57919aec05401b792d3c7e2f96ce878862c00bdd401fe5054f1af0d644186aa6f8ab109a751e4d4dcf3d645c28372629117163412e34
 DIST zoom-5.17.0.1682_x86_64.tar.xz 181706076 BLAKE2B 75f3bec06b7c452557ebf4d3fa49d494233967f207bf09b6896f7b71e94a09f5bbcddf0b259ff6ef4cac539ce63cabe496410196cd6a1a4472fd4a12ee5af7e1 SHA512 12fdd4c9b3fa3c4c87f08f36d0471579b7216dadae39f4d9e14e714dc51518982ad06e8f94f1668c7824033cf8f5cd3eed1405875dcc3e2d9b9fd7ee7fbcfc7f
 DIST zoom-5.17.10.3512_x86_64.tar.xz 186826624 BLAKE2B cf7b60953632df9a0dc19303b059e785709e5bc008cbd454db77c098d6fe31f89e2cd28ebed3054001c2cf3077376635b4360ed242da37bb104e966db19bf7c3 SHA512 f0f283937a0fda505c4845059a8a521ecd78c90842e6893e2081e1e90becf7d25a4f7dbd2e056b8a237c1966d1be178dca4745566d9783bf1b61103963ff8856
-DIST zoom-5.17.5.2543_x86_64.tar.xz 186048828 BLAKE2B e33345986d6163d366038bde870e858ffdd8259415c15a0798edfc9861c68ce2ea81e5edeeb86cbdfe730fa167b4577fd4f1e83cd1564148a9fdbb059babbb25 SHA512 f576fcf987d3908c503806803c9b3854fd2cd21382906debd84d14f87196cf742e1441a26e2972c87fd5769c915236edff381391d69cad7fc610a7f9a4f86d35
 EBUILD zoom-5.16.10.668.ebuild 5727 BLAKE2B 9f08b837d5c5f48f8cf5ec9c415b00fef71eabb4eb3aea81bc362767a031dfcb5c40299dd17c30f3e15396ec28107e6b5b28c1d8339d5df865b5ed500b57541b SHA512 595fb72fa5f1457f329bfc725d59a1c4b80e32a235ec4a66e99788bdf57e420eef8850475e74915848d696697029666e29d1521bd37a52bd07b1a503d65c5080
 EBUILD zoom-5.17.0.1682.ebuild 5333 BLAKE2B d227656b2b090f00e56b4ea397d44d566b35f7c6f3e6964439c356c089ad6271ee083091cc04891e81391ce667067852161cd7a9776ac7c98f9fc6a835451868 SHA512 ab981424140d17e0c3314650c2461c985e6905c6b4f8bc1c0328bc159560e80182498168b694ae23180bd467629b711e7964463369f1dcd184414186f708ff26
 EBUILD zoom-5.17.10.3512.ebuild 5333 BLAKE2B 5139c939a8d3714cc7dc19d72aec5c6812eab9fbe4ae74036196c3e2110269b72f31100fd176399d3b6c11854574c572ac029ca0887a18bd29ffaa9cf3e85632 SHA512 3678882bf6971ad292f1cde8392ede72313a9d2b95c79062f0fd34598bd13772941fc0b804d92039f3213010d50a8cfb4e5fbb251c0b3a2a6e972bdf226921bc
-EBUILD zoom-5.17.5.2543.ebuild 5333 BLAKE2B 5139c939a8d3714cc7dc19d72aec5c6812eab9fbe4ae74036196c3e2110269b72f31100fd176399d3b6c11854574c572ac029ca0887a18bd29ffaa9cf3e85632 SHA512 3678882bf6971ad292f1cde8392ede72313a9d2b95c79062f0fd34598bd13772941fc0b804d92039f3213010d50a8cfb4e5fbb251c0b3a2a6e972bdf226921bc
 MISC metadata.xml 741 BLAKE2B 454d9820d7d877a5b92cf3ed71cbf3d4e55a758c6dc27b94c4a65b9a2229c09740cb8ff8469c83c0217e4d9c8220aa7b97a77ec11c7fefd30569eef893e40b31 SHA512 a1c98b94bd5dc91791e852958c1d1edb29c8d36cdaa64e65ab17b50f0bf9e86f7fca2271de82ee7949013a4872ecf07a57ccbc9691d45436c7a778bed6f864e0
diff --git a/net-im/zoom/zoom-5.17.5.2543.ebuild b/net-im/zoom/zoom-5.17.5.2543.ebuild
deleted file mode 100644
index 17e2c56c3e85..000000000000
--- a/net-im/zoom/zoom-5.17.5.2543.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop linux-info readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="Video conferencing and web conferencing service"
-HOMEPAGE="https://zoom.us/"
-SRC_URI="https://zoom.us/client/${PV}/${PN}_x86_64.tar.xz -> ${P}_x86_64.tar.xz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+bundled-qt opencl pulseaudio wayland"
-RESTRICT="mirror bindist strip"
-
-RDEPEND="!games-engines/zoom
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/mit-krb5
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	>=dev-libs/quazip-1.0:0=[qt5(+)]
-	media-libs/alsa-lib
-	media-libs/fdk-aac:0/2
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/mesa[gbm(+)]
-	media-sound/mpg123
-	net-print/cups
-	sys-apps/dbus
-	sys-apps/util-linux
-	sys-libs/glibc
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon[X]
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libxshmfence
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xcb-util-image
-	x11-libs/xcb-util-keysyms
-	x11-libs/xcb-util-renderutil
-	x11-libs/xcb-util-wm
-	opencl? ( virtual/opencl )
-	pulseaudio? ( media-libs/libpulse )
-	wayland? ( dev-libs/wayland )
-	!bundled-qt? (
-		dev-libs/icu
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtdeclarative:5[widgets]
-		dev-qt/qtdiag:5
-		dev-qt/qtgraphicaleffects:5
-		dev-qt/qtgui:5
-		dev-qt/qtlocation:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtquickcontrols:5[widgets]
-		dev-qt/qtquickcontrols2:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-		wayland? ( dev-qt/qtwayland )
-	)"
-
-BDEPEND="dev-util/bbe"
-
-CONFIG_CHECK="~USER_NS ~PID_NS ~NET_NS ~SECCOMP_FILTER"
-QA_PREBUILT="opt/zoom/*"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain an icon, so extract it from the binary
-	bbe -s -b '/<svg width="32" height="32"/:/<\x2fsvg>\n/' -e 'J 1;D' zoom \
-		>videoconference-zoom.svg && [[ -s videoconference-zoom.svg ]] \
-		|| die "Extraction of icon failed"
-
-	if ! use pulseaudio; then
-		# For some strange reason, zoom cannot use any ALSA sound devices if
-		# it finds libpulse. This causes breakage if media-sound/apulse[sdk]
-		# is installed. So, force zoom to ignore libpulse.
-		bbe -e 's/libpulse.so/IgNoRePuLsE/' zoom >zoom.tmp || die
-		mv zoom.tmp zoom || die
-	fi
-}
-
-src_install() {
-	insinto /opt/zoom
-	exeinto /opt/zoom
-	doins -r calendar cef email json ringtone scheduler sip timezones \
-		translations
-	doins *.pcm Embedded.properties version.txt
-	doexe zoom zopen ZoomLauncher *.sh \
-		aomhost libaomagent.so libdvf.so libmkldnn.so \
-		libavcodec.so* libavformat.so* libavutil.so* libswresample.so*
-	fperms a+x /opt/zoom/cef/chrome-sandbox
-	dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libmpg123.so
-	dosym -r "/usr/$(get_libdir)/libfdk-aac.so.2" /opt/zoom/libfdkaac2.so
-	dosym -r "/usr/$(get_libdir)/libquazip1-qt5.so" /opt/zoom/libquazip.so
-
-	if use opencl; then
-		doexe libclDNN64.so
-		dosym -r {"/usr/$(get_libdir)",/opt/zoom}/libOpenCL.so.1
-	fi
-
-	if ! use wayland; then
-		# Soname dependency on libwayland-client.so.0
-		rm "${ED}"/opt/zoom/cef/libGLESv2.so || die
-	fi
-
-	if use bundled-qt; then
-		doins -r Qt
-		find Qt -type f '(' -name '*.so' -o -name '*.so.*' ')' \
-			-printf '/opt/zoom/%p\0' | xargs -0 -r fperms 0755 || die
-		(	# Remove libs and plugins with unresolved soname dependencies.
-			# Why does the upstream package contain such garbage? :-(
-			cd "${ED}"/opt/zoom/Qt || die
-			rm -r plugins/audio plugins/egldeviceintegrations \
-				plugins/platforms/libqeglfs.so \
-				plugins/platforms/libqlinuxfb.so \
-				plugins/platformthemes/libqgtk3.so \
-				qml/QtQml/RemoteObjects \
-				qml/QtQuick/LocalStorage qml/QtQuick/Particles.2 \
-				qml/QtQuick/Scene2D qml/QtQuick/Scene3D \
-				qml/QtQuick/XmlListModel || die
-			use wayland || rm -r lib/libQt5Wayland*.so* plugins/wayland* \
-				plugins/platforms/libqwayland*.so qml/QtWayland || die
-		)
-	else
-		local qtzoom="5.12" qtver=$(best_version dev-qt/qtcore:5)
-		if [[ ${qtver} != dev-qt/qtcore-${qtzoom}.* ]]; then
-			ewarn "You have disabled the bundled-qt USE flag."
-			ewarn "You may experience problems when running Zoom with"
-			ewarn "a version of the system-wide Qt libs other than ${qtzoom}."
-			ewarn "See https://bugs.gentoo.org/798681 for details."
-		fi
-	fi
-
-	dosym -r /opt/zoom/ZoomLauncher /usr/bin/zoom
-	make_desktop_entry "zoom %U" Zoom videoconference-zoom \
-		"Network;VideoConference;" \
-		"MimeType=$(printf '%s;' \
-			x-scheme-handler/zoommtg \
-			x-scheme-handler/zoomus \
-			application/x-zoom)"
-	doicon videoconference-zoom.svg
-	doicon -s scalable videoconference-zoom.svg
-
-	local DOC_CONTENTS="Some of Zoom's screen share features (e.g.
-		the whiteboard) require display compositing. If you encounter
-		a black window when sharing the screen, then one of the following
-		actions should help:
-		\\n- Enable compositing in your window manager if it is supported
-		\\n- Alternatively, run the xcompmgr command (from x11-misc/xcompmgr)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}