gentoo auto-resync : 31:10:2024 - 03:04:18

5 files changed, 24 insertions, 19 deletions

diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 38c9c21456d5..740fbca25c35 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -73,9 +73,9 @@ DIST smallvec-1.13.2.crate 35216 BLAKE2B 31a268aad595c06cdb078577a97b089dbea156a
 DIST subtle-2.5.0.crate 13909 BLAKE2B 660c3a472ca54c9843ce3feea74b802e27fd7f62dd37a30e2a4ba82e4b3a71df63562e8865d5fc675d31d0900998a8730503f91a61450884446a3bdd6af0041b SHA512 f150b1e2037554f8cd3213a54ddbc258f8f670cc4f39e7084cdea4b47538dbc58b834bc93b443d58a4b9087224efc003234042aaf366687dbd32b1e7174082a0
 DIST syn-2.0.61.crate 257199 BLAKE2B d2133732d9a7f16c47729be1b4c18c05ffdcb9cb1395ca9b8e0ee68098c746e92b82b7fe02d33b70985a04c943b38895996da115489c712011f7cfb4820d4f1e SHA512 368f5b5eff3988f6408be59ed4861397d532f6b0225abaac8befb458e87d4f48a92977d986b1a994bb7fc80d9ab455529bcbe5e2ec4e16d0e4810a1e66bd3042
 DIST synapse-1.114.0.gh.tar.gz 8697736 BLAKE2B 984cab788fd88ffbb1919b4aad75df741267a1d8752d9fd95a68e7bae75b28993b325fff32d721661607c3d66761f2ba5768ad6f0636f65a23eb4fc9c9e5100e SHA512 14e9abd441d1f67411d7087ca489a52343d7804ba8b575326ec52e128c0a3a0ba533b08ddaf3d31b49ac80d7b79a18e9ccdde581510c69c883d4284ddd4aed4b
-DIST synapse-1.115.0.gh.tar.gz 8750060 BLAKE2B 6e5b50b43b690c74b63e1f13b886706f695301e12e4d2c47d6d21bc58919861413914237fe22e77b31c1aa6143df731a7a570063a704a5fd70264ad2902ecd14 SHA512 6ad41f8fa59de6ac13d4cb039d107f4bcce41bcdee51f2347645359baf89437665aad7a27981568c0b8d41732503f68a254414d42158fb65504ff465cbb10669
 DIST synapse-1.116.0.gh.tar.gz 8783785 BLAKE2B 1375c30a28b2dace135af18ab15de2b20a6057b65904919b1f10f4ad301c02cbee76d2c8c312a5698a8041088ec0376be2f4dcd5ededdcb76ed43b3b967da3ee SHA512 9bfb229cad9aa39d82b1a65d1038127ae8d9fe97767363a1b2218caf26920c59d3c7d3497c8ca864ab47e97c433b522b8373e5fa3f9dcf83872c04c5032cfc73
 DIST synapse-1.117.0.gh.tar.gz 8786739 BLAKE2B d2466ee09d2c9810adcec364855f056e9019b36b653cdcefa9d39d6c6e8d10cc43fbf09772143363e1810569e183d3ba4707c79a45c510901720a7225b196dfa SHA512 9e2e2ba66672c3d8748e1c09e8b508b2c1255ac2d2fecb6b99ddd5badc806d8727578202a75ae95db6c05702ad93aa54019d14fe90e5a77f199a7664803810ef
+DIST synapse-1.118.0.gh.tar.gz 8798820 BLAKE2B a7eb3d1652f08a3eaef609f9a381dd6a28bb8ce809c2c6764cfbd16ea99fca36fcd200d862d0ae32f76366be7f0eb0d3250b74a229c912c9b58c533f4d3ac290 SHA512 d65f44588c9ec16f3c76e5f0129ee60bc08764d0af929d841570671aa83194b2a14417220612b85e94daa16282c75956599b76e171591c2a9a0f11c95e3e1a06
 DIST target-lexicon-0.12.14.crate 25508 BLAKE2B 5ebb6b49e5c3b0057959557651287d4bf5ffe5b499340019ff64d5fc3b64e780e344982e358c94b1b25a20bf0f526a584aeecc704695b50a55cc268dd65edb97 SHA512 3410ecc0faf854f49c41c99f83972960e67065b1e0e78557a7c4996d996109bfd167d2121a019f5256f996c896cd45af032038ab7918fdcc6ee6311693ce951a
 DIST typenum-1.17.0.crate 42849 BLAKE2B a6d1162050679e2c4ab2467f3a77d301f6861882eb7c9749f31d047f383dd5bd2ed5846ad63eed99ccc04d6ac36cc697a305861e1d65880b4d2ef04ee0a79b94 SHA512 99773d5d9f850c0602db4bb67dd062b0ade6f086e155216f1bb2fb6569461ba7e1b7c2f2af81ea8833bc3bfcf3fe5033edecb7c438adae63f59d3e30cf63a508
 DIST ulid-1.1.3.crate 11596 BLAKE2B a079fc34f5af9de89469d1edd5a53c1bc1a0f9bff8ce731c185345fe4067432a121efc6a04ac6cf377fd03c89558067e7d5d52c4b9dfd23e7055ce5af89e84b3 SHA512 a8f6ab3601417e7a46a763bb28722c3770fb0c2dea340c02a8e96d2e3597a304589745c65278c90bbc64f5153501a2a85321386669fda71ad7252ec67dd749df
@@ -98,9 +98,9 @@ DIST windows_i686_msvc-0.52.5.crate 895404 BLAKE2B 02555169f8c5b944231a877de8693
 DIST windows_x86_64_gnu-0.52.5.crate 831539 BLAKE2B 54f84c19988addeb7cbbbddb940e430e7345944589419592b99addf9b83bf6d801b18f4e80399b85bbb0b0ccf4608e36d9a50b79d8b1d6ce2b93745856e06eba SHA512 d9bf91765d02d2727344e42081f4bcfa73be97991495126f7e633f27e56a261ada3a8b865a559cfe71f9bc9aed5b14504f89138796766937b3521009726dfab8
 DIST windows_x86_64_gnullvm-0.52.5.crate 433246 BLAKE2B f34328a6d100e092ecb34a6305daedf4fecd71840432f104e8707f049b60d784584ce4f02fabdd0281fdb8bc7ebed34b38fdacf3be9c8abd60084e9a4ee9fd56 SHA512 22a978c40df9705cd94e4c52f2b706e477e667b564c608d0adb144b38cb486c279c09d1eb1dd2d6c7bd3401b75a2dc5eafe0f7d642ffe6453f394d1f59483a08
 DIST windows_x86_64_msvc-0.52.5.crate 827905 BLAKE2B fd5dac198bfbf29878cb461a7338c289c9af16ea80b3e5fa567980d2a6a5ea6a1cd83729ce6fd67e4da171873083dbeb1d6e16a287620f0245201f9cb29c29b4 SHA512 81176090dc725d7fe3867e6322fdc4a4065168580847b35e6f8da345f685c4f66a81e35cd1880dbaabdd4cdc82446dde9d6a0e583cf0b7fe47dda8bc8002f1c6
-EBUILD synapse-1.114.0-r1.ebuild 6325 BLAKE2B 3a2932d68baa6c63ee9b762dea5088021bf9f7d4ef1ec9d71595bf85d4cfd904c54e55a8c0ccbac594bf1f8c188cd569465420f6f9fea371210e562f77ef21a2 SHA512 1b5923ddeb84b007defcaf05a993f47d70a23140c6b6875fc244969c0b69016f4c4c0ba611f518343e422f47426847c0c5787d50901e8748950f66ed5c701384
-EBUILD synapse-1.115.0-r2.ebuild 6402 BLAKE2B 3c5c9982208958b7850491c2df9fcf3523d1c885605bb9def3a318027d80c891b3d304094069b3067a1316eb8acbd73d9d621691e8845e15a0f4d3e0790473a9 SHA512 4c01886615f7858aaa974b6fe8e0004c0c47c94bf73e59909a03b5168e23da10a313ba87f1a98c14b5db26b042bb0c85abde8dc4d05c58a0bd5d16b3aff03c77
-EBUILD synapse-1.116.0-r1.ebuild 6326 BLAKE2B 9c14c3924f51543b506f344cbb2a3d7271e08abdf9603f05f17a9f92eba8fe8c7bbc6b595f2e8c56a309c26944bda226b90f129c4cd85c69ed59c97c10949a5e SHA512 4f797037ec24991453e6a45699acc7284d9ff81ddd57ed21f4ebf76cc15e8e4ec36b219f8874446566d0663a26a66cd9491f898767f5acfce30ec39e25115169
-EBUILD synapse-1.116.0-r2.ebuild 6543 BLAKE2B 475ccd41ebf22731dd5bc4d79bc778c1dfbb74e42ad03d0950e65610ab4903ab42b62a7c8764a0f2706a42f525b21defe6559ecfec08fd3c6cea57ac903059fe SHA512 b0f0daa09c78500e5e10458b34e07dd9b877d0abdd514231e3a71b7edd166a6a2d30600a859c24cd295587d453b5679d2d990676a93eccd121b925dd914d77a2
+EBUILD synapse-1.114.0-r2.ebuild 6336 BLAKE2B f1b5ca8c0fa01e7536db56bc752c3a2be0061c1c97cf1d247887cdb923731f647198b52d415a82cd458032c23bf1042a9167c13810ba9585114ce1ebaf6f47c6 SHA512 da7cae6f4fbfa9aafeb64b3190693b57f15e09209eb7873c7804bc1842e1708ed3e2fb06a2ee1bd7ed8b2154b77c0ba293b9765065bede36cefd5f4d412529d9
+EBUILD synapse-1.116.0-r3.ebuild 6337 BLAKE2B ea75cb80eb0652fbf73e6f9ec9064276b76da66d1bbfadf525802f19ab41b4b5dbdda8df32c1338992e5106b71713a30c76fac1437d84a2bdc7c9cca8572d6ad SHA512 7dd175775176816f8cfff2bbe989aeabc51b9b9c57574a911f5501e2bcdb0bd0b131df5ae7695eb17e6d98551d10afe0c1ea3f47140eab77fc573199aecf1c34
+EBUILD synapse-1.116.0-r4.ebuild 6543 BLAKE2B 475ccd41ebf22731dd5bc4d79bc778c1dfbb74e42ad03d0950e65610ab4903ab42b62a7c8764a0f2706a42f525b21defe6559ecfec08fd3c6cea57ac903059fe SHA512 b0f0daa09c78500e5e10458b34e07dd9b877d0abdd514231e3a71b7edd166a6a2d30600a859c24cd295587d453b5679d2d990676a93eccd121b925dd914d77a2
 EBUILD synapse-1.117.0.ebuild 6543 BLAKE2B c640bd4190077585b162194150d2f5c91d9183b11685d87015ce050ce1111ed799bdc91e409d07e58b87f63ee023ee02928ed0cbb641db8cbb3bfbfe554daf86 SHA512 99b1fc65cbee87bc96855ec9c39fb523047329d2dfcee829f042f31c24bbf977a5c0f382ded8f50220e3d8797866c3affafa8a0cb75dc55630e1ea48fdca9bea
+EBUILD synapse-1.118.0.ebuild 6543 BLAKE2B c640bd4190077585b162194150d2f5c91d9183b11685d87015ce050ce1111ed799bdc91e409d07e58b87f63ee023ee02928ed0cbb641db8cbb3bfbfe554daf86 SHA512 99b1fc65cbee87bc96855ec9c39fb523047329d2dfcee829f042f31c24bbf977a5c0f382ded8f50220e3d8797866c3affafa8a0cb75dc55630e1ea48fdca9bea
 MISC metadata.xml 381 BLAKE2B 8bf85af089213456d20c9d66a4d9788ff209983f8fd98c9fb6cf03e03ab5c12c9d5518ff4d86f5d4fb2a9a1080516f1febfedf5b06b0cb8e101cdc035bb139f4 SHA512 e88fd7f735bc9ca0aced01f49ca539134b297a5c9c5ee633fe3de64626d6f4b4eb547326288abea9c161f2647852c23658dba17265e64254335870450f644307
diff --git a/net-im/synapse/synapse-1.114.0-r1.ebuild b/net-im/synapse/synapse-1.114.0-r2.ebuild
index 5445fd9a9573..b310112b701f 100644
--- a/net-im/synapse/synapse-1.114.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.114.0-r2.ebuild
@@ -153,7 +153,7 @@ RDEPEND="
 	dev-python/service-identity[${PYTHON_USEDEP}]
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-	dev-python/treq[${PYTHON_USEDEP}]
+	<dev-python/treq-24.9.1-r1[${PYTHON_USEDEP}]
 	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.116.0-r1.ebuild b/net-im/synapse/synapse-1.116.0-r3.ebuild
index a5627622a9e9..5f12f11e3a9d 100644
--- a/net-im/synapse/synapse-1.116.0-r1.ebuild
+++ b/net-im/synapse/synapse-1.116.0-r3.ebuild
@@ -153,7 +153,7 @@ RDEPEND="
 	dev-python/service-identity[${PYTHON_USEDEP}]
 	dev-python/signedjson[${PYTHON_USEDEP}]
 	dev-python/sortedcontainers[${PYTHON_USEDEP}]
-	dev-python/treq[${PYTHON_USEDEP}]
+	<dev-python/treq-24.9.1-r1[${PYTHON_USEDEP}]
 	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.116.0-r2.ebuild b/net-im/synapse/synapse-1.116.0-r4.ebuild
index de5fd7861198..de5fd7861198 100644
--- a/net-im/synapse/synapse-1.116.0-r2.ebuild
+++ b/net-im/synapse/synapse-1.116.0-r4.ebuild
diff --git a/net-im/synapse/synapse-1.115.0-r2.ebuild b/net-im/synapse/synapse-1.118.0.ebuild
index 39b32557718e..978cf20a6966 100644
--- a/net-im/synapse/synapse-1.115.0-r2.ebuild
+++ b/net-im/synapse/synapse-1.118.0.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{10..13} )
 
 CRATES="
 	aho-corasick@1.1.3
-	anyhow@1.0.86
+	anyhow@1.0.89
 	arc-swap@1.7.1
 	autocfg@1.3.0
 	base64@0.21.7
@@ -17,7 +17,7 @@ CRATES="
 	blake2@0.10.6
 	block-buffer@0.10.4
 	bumpalo@3.16.0
-	bytes@1.7.1
+	bytes@1.7.2
 	cfg-if@1.0.0
 	cpufeatures@0.2.12
 	crypto-common@0.1.6
@@ -59,14 +59,14 @@ CRATES="
 	rand_chacha@0.3.1
 	rand_core@0.6.4
 	redox_syscall@0.5.1
-	regex-automata@0.4.6
-	regex-syntax@0.8.3
-	regex@1.10.6
+	regex-automata@0.4.8
+	regex-syntax@0.8.5
+	regex@1.11.0
 	ryu@1.0.18
 	scopeguard@1.2.0
-	serde@1.0.209
-	serde_derive@1.0.209
-	serde_json@1.0.127
+	serde@1.0.210
+	serde_derive@1.0.210
+	serde_json@1.0.128
 	sha1@0.10.6
 	sha2@0.10.8
 	smallvec@1.13.2
@@ -148,7 +148,7 @@ RDEPEND="
 	dev-python/pydantic[${PYTHON_USEDEP}]
 	dev-python/pymacaroons[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	<dev-python/python-multipart-0.0.12-r100[${PYTHON_USEDEP}]
+	>=dev-python/python-multipart-0.0.12-r100[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
 	dev-python/service-identity[${PYTHON_USEDEP}]
 	dev-python/signedjson[${PYTHON_USEDEP}]
@@ -157,9 +157,6 @@ RDEPEND="
 	<dev-python/twisted-24.10[${PYTHON_USEDEP}]
 	dev-python/typing-extensions[${PYTHON_USEDEP}]
 	dev-python/unpaddedbase64[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/legacy-cgi[${PYTHON_USEDEP}]
-	' 3.13)
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
 	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
 "
@@ -179,6 +176,14 @@ BDEPEND="
 # Rust extension
 QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
 
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# python-multipart package renamed in Gentoo to python_multipart
+	sed -e 's:import multipart:import python_multipart as multipart:' \
+		-i synapse/http/client.py || die
+}
+
 src_test() {
 	if use postgres; then
 		einfo "Preparing postgres test instance"