gentoo auto-resync : 12:07:2023 - 10:31:55

5 files changed, 77 insertions, 479 deletions

diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 0b9f2e9a53ec..74f5997286eb 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -1,7 +1,7 @@
 AUX synapse.initd-r1 345 BLAKE2B bc4868eff0103c657725b077a5f9ad002300b34a1a8bb85820c3c12b9da733fb33ef136a3a992cfe50844cba304cfaa8f9577e4f5fdcc9e94f653406043ad663 SHA512 44a0f7124f8730b4fc8f0e52284d8f03a0bf016c584fa0411910f66d236e3130b1c749d45ff84fa3a8619716bb973ff51f0a5733b06006640894eb39f29d188e
 AUX synapse.service 549 BLAKE2B 4b91a2da29b2a9afc5a6cff3c74a8b2f0dbe86063d0a47e60fddf8eb712b3642c308181ba2444a7e59b58f942368e7217dc94088a2487816aa44e28f49094573 SHA512 a9039c2883008c191cc89bec6f52893b489688e83525eeef09a979fc22b09b048cd03d6a7a450ac3d1441abccdcd6786cfd6c8f0b90ea98d1516c312bf634636
 DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
-DIST anyhow-1.0.70.crate 43803 BLAKE2B 574da0e447592c12051deef171850b00ac2347dd336f71915dd21f45cc03439fbcdbaffe261097d53cc11fa0db75b1e3b21ba667f26c08db7125b1c6264973de SHA512 6fd1338e4cbe915cb01fcc5e05e7e0c051868701eeb27f03577a7cfdd59057493922b36e2308f7050608a851112d4d24cff2826456160ac8930fe961640e809b
+DIST aho-corasick-1.0.2.crate 167694 BLAKE2B fa5323cbe6cb73594dfa4c327c64676bc1e006dadc0b9def325974c83b9a769beba02d59a4657ec7a2d0cc511a7b7cc6f72cf57b8f9e639206d1c2bf13107a52 SHA512 5c75451f96fbbd670e6af0e1f54df2bdb57259dfe6898495ac46a5b2fc04f316a4698fd5cfd4ec31a94c298661937a8de08ce97cab3890fb3c015e4a2a67bb7b
 DIST anyhow-1.0.71.crate 43808 BLAKE2B 1ec6b440758e26b2328738bab7c6b1fe8670959793cc24f61cecd0d8b0ebe60b9855ee1cdac9b5f5a5b238daf796eae5b7c82b903e7c822a5625d95130f8b61f SHA512 401b1c5d04fa0581f303395fcb3af5e7684ead367e2a173b4d90db9c04ac20010c5330a686f3ba91a541e1526a7185091b7dbfddce5134b5a74cc749b0338da5
 DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
@@ -18,8 +18,8 @@ DIST itoa-1.0.4.crate 10601 BLAKE2B 95545252eaabc3114323a44c8b8ea12a91568d9fc8d2
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.135.crate 604591 BLAKE2B 195f342d1136f63c308371f001c9fc270e151fbda7b316321d319b57bcd46f206bb8b06196f5e9cf8a35b0c397d909f370aef8b119f4bc0eb75b9e245d8e7b4a SHA512 dc8e8fc918c5184de6ae7414b523b06ae91cde252e837e863f8477e9722ccb206a0b27762ac204830e8d09071413029c03802a3ed93bff274c33b2a4055e7806
 DIST lock_api-0.4.9.crate 25685 BLAKE2B 8adf5c3cccebdf6aff6ec977f230cd2a208b0b188ef57deacbbc6019431f0ede1a760b2384ba3cb49c96b8a589dc56c0f46a6359b3e62277e7ae1a1c3f586fa3 SHA512 9215381d9bb6b80d217c73a900db43df043b3e939b5bd7a292a02e9ab911cf0eacd8f883d35bdf72b3a0e78df8f1bc3e843ca4c775294c7a7a03091dc1a74990
-DIST log-0.4.17.crate 38028 BLAKE2B b46be3719fc0a53e50b1f342762e188587e9f1ceb692c72473ce2663edfb8253742d30024e68c1444780ab7fc0e2d5b0601b8ea7228dc3405a9342a57548e605 SHA512 2477d88db42b1d92c30708d88823212e236f613b3465e85eb425f83f8d16fadfaf0352f06c2999a1852102edd2f6ffb10ecb539d8a3b6c48f552a25622ccffa2
 DIST log-0.4.18.crate 38339 BLAKE2B c233a7f792b052d6a23badc839b2e01c0a7a977849a476a0f5e82608037fbb4387c48287283845eaa1e02ce82b1b79bfa020fb49515aaedc784f1c77677bb710 SHA512 c499ab111d0fdb3297f08a4dc538b93d5a9017e6f1cd63dfdb84a799cc445f181379ba02db83072c943ae2e1801bd6f6f3d075c86819108389fbe0e90c87d456
+DIST log-0.4.19.crate 38073 BLAKE2B bbc8ce51ad4a01562ecd204a531ec7d82101a342ec26405dfadd1761372f7039297dc97f4899889ebdf4eccbd56345e015d4ec6d2788851e523db56eb541aab3 SHA512 8f11ca6f5a99b61a5f3baeb7a23b7a879b3a5bed666337936bd1d8794864d14a6c4f0747d03505831783f15d8c14ebcf507267915481dfb1b32188b8ab36a038
 DIST memchr-2.5.0.crate 65812 BLAKE2B 57966413a1f933dcb2d2d4ccb29c247070f65a83299b2a9f5aa83f5a48a5c5f1c4c7c632fa63bd19f9508e9291e7258db2f16e2813a56fd84e0856f70f1e67ab SHA512 444a163b484c233e78c0e2e4d51f01ce2da93d7d29f516a95e4b0866b20bdfd3f34137653abed53eb70387991ee3e2b5937d8d4360a85bbcb50a93005a75defa
 DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST once_cell-1.15.0.crate 31460 BLAKE2B ae4481883865abe6a684d63520fb2e91b64d6ccdd0374464200015640122bd68b8a769309773226c8a31d0119f450ee821a2bd35c346fd86adb4474ea7c28fcf SHA512 934a7c3631e9ca4fa78d9577b6672ca0b2f926a8d6c3be9542b906c5968033446f98f76ae6f368a1a5b92ab9064c31a57d74ab6d2097108029a7ea951541ff7e
@@ -30,28 +30,30 @@ DIST pyo3-0.17.3.crate 408939 BLAKE2B e67ce34c626dbede3c76abf66ba5078827e8a75644
 DIST pyo3-build-config-0.17.3.crate 29230 BLAKE2B 193df0c15a2150505c823338e76f4d75e2f28158626edf332da2b10b6a81bfaf7f95a3a32c9f218717504b2f0dd80d3fb61c78ab3df9cb9024c3686f8ca002b0 SHA512 92652ffdfb3f6c3c8a1c2f97f5e2ed19175ba6bad5cd0f0c113b569369193aa18d95adc780bbdb8202d815a1ec0b6aeaf40d93d64faab42f4e8b452c806906a2
 DIST pyo3-ffi-0.17.3.crate 62854 BLAKE2B 3f1c519b210de0aee19b832845c1d44237f780f18173ddc1b1cef5eac1060fab40fd8dbec067a49e4d28fc7edcd0bd751f54438ad42a8b98641de0517052c64b SHA512 c08481d1530207fee544a5dde14253415e5451c1c013b86ac1f0e9bcb3c1df7866764cd11bad523105b6821725560329b89ff689b3aa2f0698cdab148d0fc12e
 DIST pyo3-log-0.8.1.crate 14082 BLAKE2B 1920a34d18f1f418857abca05c59f5f9a16d00fc460082c2cbe97bc55b8f429d6433780d667a211beecf4df81a2606aa502ce2a1ebb6c0833b74a604abb5eecb SHA512 d69f7c8e3d1997ca06201c15500a2e0e043f7c0b39c8bd826ce9dbced220b4b0fde0c31b865fbc41f94f188e4b9ea15b49e2e2e42068a82678668f3a51a2fca1
+DIST pyo3-log-0.8.2.crate 14254 BLAKE2B 264976c24770d20ba369e3a90f3487cf77ed5ee53c0d075485cce39b3f4b24058538ae1fc8d9122abb4147ef38f1852850ff31ea621f4913acb429f5504d5a33 SHA512 60235b4e2f8e03bdf7538d37f5f8c385941500607f5cc2a284d02d0e25d27d13397a95a205fe924c5f96d6b5470b45c84c4ded7a5609463eedf735d4f2966f9e
 DIST pyo3-macros-0.17.3.crate 7257 BLAKE2B 4c5e166a37c31f2cc21b7dce9b46dcdaeea0f12299c421430efe72b47ac954f10680bf6ecb28a5f0058abaf22519f6ce05d21e5de534e362ceb9847049601f4f SHA512 f99d38ea69b1d46599d203908d12eb3fe4869a48b21b3eaba0c9c8e52b9f2b3c5ea72505dcb9b3330450dd724eeba859eef724fe9624ebbd8bd3cbcff7372df1
 DIST pyo3-macros-backend-0.17.3.crate 49992 BLAKE2B a922c3c2c1f494002fa8592704c43ddbb4d9bf650187adcfc94f82c1275bcb69d444ede404d1b40bdf1e199427e8de880464b76c7385c2f96633544ad021c4b4 SHA512 b4dbddc3ac7ae542560459376127cabdbb4de83c04d70a4efe0976fa94e6ce94a7a62723f689a8fbb1d795fc235b1ac3611f8b4985ae2af0db4a9dc08de48927
 DIST pythonize-0.17.0.crate 10949 BLAKE2B 6d3c311aae1ef97a2a965124eb23e312f94c4d1e2a8ec17d9316c9fd2f72990b95977a87f722012e4fb54ce0a8be1a2eaac57b71e9d429dbbe59b0da387b2b81 SHA512 a9a46d27b8aa9e5bd7bb0b114b7457275131d90e20acd07110fbc18b3af3b9aa0683b9306fb645645f3801b64c0c479998665f3e4fcec0ed8e5b5947008b76bc
 DIST quote-1.0.26.crate 28397 BLAKE2B b468a5e9350843ea81e540d17c9fcb302b46fbd450e10280c5fff6fd7c98a439df8c3d3d47e551bc6d67ed02052b5b5c65d215d5ff8ee34f045747e75c1ba37e SHA512 6fcfe4d31f601aa60beb858c25df217421b0a184d185eebc7a4cb9fbf97c687992b77bebd8671a9e6193716387c3e926fed9b75a08684eb2d9a5b155fbc321a5
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST regex-1.7.3.crate 239886 BLAKE2B 8d9413178b626b09243e18a1c5e0336cd41e05659128d4026bd551df0c34b9e141e36c3134f3b22200b18828ef89082a08515047159afb4f4960e5fa840fd54b SHA512 f7e8dbcfaa10c2443b9a6dfa514edf0e149d33f1a135e4a828adf97dbb0f1af5a4b58a2bad75ea8cbecb9641f499b30ed06b8ba60c7eaba79409ca18ede85e4f
+DIST regex-1.8.4.crate 249562 BLAKE2B ad6d1221412beb65eb760ae905d4becc5583ae4d030c67b061626afdd3d4389c24123000688039fc6c8c1d091ff307b4a46f4b0eb84f1c258d0612c51aa2627d SHA512 6fa873671bc188906334202027fdd4d15923fcea88aa85d56a63e3a36bcf6aa77ae61c596f9154dee6c69e03bf3f3441e4ce26304d5a8e0ac47d710bf7af4a5a
 DIST regex-syntax-0.6.29.crate 299752 BLAKE2B 2408ebfe5f0dd6578c33f18e8ea9a0a7a84388420c5b67adcaedde477f3f67fb3e39ba9fab1f6892c7ae7fff754c4aca51314601529cabc6a8fc43af38a11f88 SHA512 28a58950d15df1f0ac4ff4185c05b535e8f5bf0b75f79fad24e40e17a02570d1c9bd9cfc919eed8756a1069bc489c5fdccfd04f6b8266c83e3412b7b4bdc262e
+DIST regex-syntax-0.7.2.crate 339778 BLAKE2B 0b9533e4e4bfae1304a7ab5e2c8bc0bc3038367dbcab7bc19e680bc4945146f1eca3baa1c5bbff6ac60447b54059228a5790cad20ae33f16b9dab794a5f76140 SHA512 3065cec128ae6ce427d13b68066fc02357c21f7d1517c1669295f857395eea3297344fb2171c96d15dfe48050785249b7b8b8138fbe5b4a65c8427968347c128
 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.160.crate 77010 BLAKE2B 45d2585bd7e5dcd368b72c29046bd595c577826da4aea6d019adaf07d23adc096db7aba952037dfdac9dbf08a1e92ababd44cc784ace557fe2cfe83beca446cf SHA512 b03eb453ac01a483843829952462de4e8f6d0fa4a244d38a6f476a911e2e991a508121265befd108134ae7cce8a7a40c4d217f80f3e025f9a612a0bf80862306
 DIST serde-1.0.163.crate 77030 BLAKE2B 0d7ead66faab8ae01c693c9bbcadfd0a7a736c8bf46f50ef43ba261eec9e0f0c43477feadb2e134f0ed6dda3115dcbc3d22daa28592f343739f1ea03d9c25723 SHA512 752738ef5f67f1b4435bdd4e76e740ba192bd93e83cac55fd667809af26ceaf02db7083aaf7b2074644b38964021af206000b6130199e7994c12c9c57cd31a34
-DIST serde_derive-1.0.160.crate 55081 BLAKE2B 851cbd173bd758d46c9f545f05a17f65f7b0a2cd353cc75a985072e3772ca6d8395b63208d845dfba231d7cb5fcee97ec0df0bd0df010096577d618fad8bffb0 SHA512 14b2a2ad7131efa7ec95d5a6e7633a9d1e991b046c0b00cce9c3681edd73cb53ff477aa52a430d8465aa8b362696244ea80f12ffbf0e6f98e35605fe4c60f407
+DIST serde-1.0.164.crate 77057 BLAKE2B a3c9c7deaa841a559ec901eed72a768e0718a77683897a84149dc8211f3e6f8f016e6b86e5b3c7c3c3d512486dd7fdda2860f69e7d9e600fff6ca6da8870bfd4 SHA512 17376fad0d3f0fc696d713c0eec81fc4a83992f6f9dfbed7c3e700e7ca8a3241abd46d4c11303d26a5fe049ddaf3308c2e76b650cc7350e03a1e34002700552a
 DIST serde_derive-1.0.163.crate 54447 BLAKE2B 284d02fcbdd05c53c8da737fac422fd61ff53669b140686d1732ef727a1e873945b1ebdb85fbda1d79f2c563b2c7b81d3ac51c76fe0cf5205dc6ab4d46a9d4d8 SHA512 744c4235330781c8d9c6ab4f49f6ddd11fcd70b97c97fcbf1434ccac02ba7d29eacfed21ee8e005f5541dd8ab4a34023e95d85231f11c5f4d6e24fcf806f7283
+DIST serde_derive-1.0.164.crate 54789 BLAKE2B fb8e50cabecb66bfbb4eff07bbd034510ebc4eef5fa21c855887beb84d19b1201a4e9dc0f68a2aeabc559f2229a905cc44e780a7e6bdc55aaed399bde5dbe168 SHA512 08777ed5775ee6ea47daf084f4ee15869b3969d54e43e6820277535e79b70f61f6152decaeea29bca67137d354bad079393a6709fd10d7cfeb50728e46030c04
 DIST serde_json-1.0.96.crate 144652 BLAKE2B 2754e63479aa07507015dcb0f989d6447f5b2c01e5f02cf8a843d90c90c6fd0acd3ecb68d80d76c249efdabe0bd0670649a9e576269928d2276ba00a3153131d SHA512 39779419900e1d395d81e70cff0e7a688564a66124b08e74da54ac30f389c912707f4bf5e29afab6fa106faf4bf4e0b841f42fef125cf7bec185482ff6bbba0e
+DIST serde_json-1.0.99.crate 145102 BLAKE2B c6911880feab10a782aebfbe06b1eb37f415cc362db41ee8f6b0353c3f909d3c92512197503da81c7b74e54cb7dae49fe62c53487b1981480269fd1e657e3088 SHA512 7636fbd4f1f12e0675a8b13d8af80f09a2dc6036f8d6eaccfe0593e2f2e7a36a2ea28fcbf36d396217a8f7995ba29c14a17e695d1c914866055c69768292b292
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST subtle-2.4.1.crate 12630 BLAKE2B 05a90232bfdc2cf67522e2972bddcd8dc9a165b1d1cf775d0b1c8358fc7c4d0559b2b899126b6688b8ef77b8b7580b3b300f74a599a7ee77f99c064a3917693b SHA512 7fd8234b7ffa3ca7e473539cad958df0842186e1dd735905e0d4977564f40a5f2e18b58180fcbe52614a00964dc150bd9f6964500847ea658f22bffe030f5c6a
 DIST syn-1.0.104.crate 236683 BLAKE2B 865904923ecac469f1d92bab04ea9ee384be0592c7a303d9d0f2f4bc755744bd883372c215a8f1add8bc2728d7c2c27489ab292fc8a89bdce918fc4a32deae44 SHA512 8feabd8e6b1b5eb15077d7c92f0b3269e848d33b1f233b3df343b6d445ed332fb23e0222911a13edfd82cee969d25c43434268cd7a20ce1c0a608a1bbe327b29
 DIST syn-2.0.10.crate 240095 BLAKE2B d2def2e1354d41bfcc3ad9cfd80ed611a56fd8560dc1b3c45aabd1927847fe69a92eb7c9575f159a5d3a004e8463f7f13ed60a4aa4ec6055552c1f731badc6fb SHA512 31f9c461b296453dcc0b7fbc71c2350658f447d4d90644b1bb35782fdf4067405090a0f9875a96fce9473855275d800d5986200b7a575b9fafd48218157b673e
-DIST synapse-1.82.0.gh.tar.gz 8239769 BLAKE2B b61c67af76255b240618497cdbf2ab7fdad0050e913a4ac5e3fc0a045a9566128315c68d4844e9f20c842872cb51d645fccfe47892e28da5ae45394ca6d5a46f SHA512 2c62e795cc927c1352d0387ca59fe9eceeefbff1aef93a7510dd423bead81f66a3bb579426c3f6ec592d4dda4743613131f895e5e626eb5aeb05d72b94d91dd0
-DIST synapse-1.83.0.gh.tar.gz 8259074 BLAKE2B 864f38b0f45577424e92ec589fb7290a0a1a6d316342788fb842b6bd92198ff35ac12669b1be966456a3ecf2831e1a678efd1117979ddafbc64b4c80cb0ace5a SHA512 c80bde4741b26182da52c6fc623075eda7cbe6c5aa74edcec4a3a52aabdba86e95d8f8433e071ee82664b5bcc75a5b25600b7b788b80ee217226ee045e2affad
-DIST synapse-1.84.1.gh.tar.gz 8275282 BLAKE2B c37327ddfd0c41e29ffeff25a26fed9e2fed3346dbd4f3910d32488b86339c8c53d4a7579ef77b7d18f00db98c603211e59e72ee027d111af5c7273a94f29519 SHA512 c98a16229532fab49e5457bfd46bd61d27736c49eee5c125f9136f107b5a5c5c3b341e8a20d1afb8d9163562bf20783ed4950f1ae2057a4a0ec8035fcbf459d7
 DIST synapse-1.85.2.gh.tar.gz 8285129 BLAKE2B 1f9ba92a8823bc01b8c18baba862dc5e5f9cf5e8aa42ecb321c6c99ab48b9e1d0122969f481f033a2a0db0e273e9e8179e0c936a2d65377e60302db4a066f4ad SHA512 8e025eeb34dbf6fcaa00bde37782d5442584e454b671fd7f49aec809977a4cf1af1aff42957db946438700b0f8c24f1be54aa4c73b2e03de40cc5aa6e66943e6
+DIST synapse-1.87.0.gh.tar.gz 8304909 BLAKE2B 9a62bc06b9b984e25de1d197d1173896ae5fe8738197d8776218fdef9bb4624f671c0210a986fe0ef43d0253aed35f8f2b16c347754ba439d40d7dcb84c83611 SHA512 4543e2ecad98793be8b4a88b613cafd020a65fa94f4b02cfc75a9041fafb9145d8a341c4196bbce5e3801c9df0600a47b48b96363da310400072eb4d597f85c9
 DIST target-lexicon-0.12.4.crate 23020 BLAKE2B ad9780b9478b00b4fdcb07bd016d83216695413090ac29cca06388c3790e2832c978b1c7e69f6d34bb6fc9adc39c0a0b6b6636e50a9715a9f5f16445dba22d19 SHA512 194fe1946ad8d9fdb383bf8a65374e24d216382c1ed5379dabc98d58842512624c32838b8d6d0658d866f6559d37f1343a30c5809e8914dd85790399252b3e06
 DIST typenum-1.15.0.crate 40741 BLAKE2B 5752d80396d0a37b0069b98ace9efe96d94ccaf41b33b8149c8b8c6a767537dbffe64251bbf61f3812465ecbc8cb45544f177dc97ac9735d84454282e4d1ed66 SHA512 a3c1ceac85e1aed98d0829449c35f4f36db860218b955b4e5f8f01da1d27ee6213f3c60e2b25c3745dcd67369049da5de737a9473fa9402db99cf7cddeb42288
 DIST unicode-ident-1.0.5.crate 35455 BLAKE2B 7e14ce97ac53a88ccec015dea690918a673dc5b49e44de7fdcb5421871da35c4f514c6db9a363d6f4bfcf2e9a61a50a593d345d0b6f388ea882b17a00cd0335d SHA512 d355370daac356d900cd4c0a792d6c0eff114524c4bffce4d7e74469fe2117883ee00bf0e27d950b72e88739473f2045d5f83440a0aedfede97b4d9163b64a6c
@@ -63,8 +65,6 @@ 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.82.0-r1.ebuild 5379 BLAKE2B cff06c91e479df9c68736718cf9ed094bd00f940d057d1858cff4c3cb04e23509ce2be3839948d17b3960ae675f8a57fc8ce67230d8684fde2ee49e4dbc4450e SHA512 76fa892175e7fa1383d8eb75f4ba1434e9b8e9f4f8a07f84cd753ec51dc0a5282a8a57ab0bc534675cc609498cb8f6963e7612ab9b8a430616d03a20d0abb104
-EBUILD synapse-1.83.0.ebuild 5380 BLAKE2B 20df285f0a9b46c9ffeed2888924f21f139f175d13a651a207170056a711fae492409b9aa329fa56e2b6fd07e5356f988bac7672af61fd5efe13e3d8b3f99d59 SHA512 fbfc515795313367c25d3c5824c4fb289603e182fa7982b618c2df4649623030d3f137d31f5e4280d4aff73338ad9a6bcc90aabad3bdb6dd6c87b5fce1d67300
-EBUILD synapse-1.84.1.ebuild 5447 BLAKE2B 228b30db3e072f294a2d2c84bef262cb534f587e9aabca80fb9bd202c33f3e978d69162f8532722135df470bc97408da1c8798e378780e21e68c5ceb0d745aa8 SHA512 95b632db64927d7c9b596bc1fd99f0d56437d4a297dacb0744ab6133755ef605c366759de1a4e6438d7830ba88080704e90379dd082e817a5d2aa974cf5ff236
-EBUILD synapse-1.85.2.ebuild 5527 BLAKE2B 7d881a771e9205a176537b82443f895fa2cf08adffc679e0300631b0cef712fe7ffc248034e76a5d22d57de7a6f4dcb0f916094a2b51e6e8e5c4c90e651d4ce4 SHA512 bbad440886560c1117c66d1c3d8f1863ecfad5a7cd6fb8a5ddfe5a5bf1d614cda70f2bc4753e12c9c630d1cb4d06b8dae4a2672f8c39ec2f0b80e71f079b3b1e
+EBUILD synapse-1.85.2-r1.ebuild 5634 BLAKE2B 2fcf70248a5371ca2b8d643f5f9b746edf8b9ae982e22f775dcdaa6b6711768ffce7ed8187b6f3b0bc979363f5d311bf6d74ff6bf0bdae76c7b7d52790237a09 SHA512 fe767b83aa6853090c519b6f71c652ad9b23b8446a4a08a7ee67fcecd54883dfebbe16fb364670847255db4ecc997be3d6af1530e152b8e27fb77b1b410dcbdf
+EBUILD synapse-1.87.0.ebuild 5633 BLAKE2B 33780bb4c5087532cb538ae4455d04d19eb3099c8d5ce75065c2df8b0de43ec49e8f3b5c0e6895150448af07d8eea898a0faf6ff6e4206c91bb8f1994a9899fe SHA512 02159570b91a9a634e3050c3bc76463953b6feed3c9dc2d8420c7c6ded9fd5bbd634b1341a712287e732eba501ec9d4ffbddfc518812ace1622323de852e1973
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/synapse-1.82.0-r1.ebuild b/net-im/synapse/synapse-1.82.0-r1.ebuild
deleted file mode 100644
index 839dd2290b64..000000000000
--- a/net-im/synapse/synapse-1.82.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517=poetry
-
-CRATES="
-	aho-corasick-0.7.19
-	anyhow-1.0.70
-	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
-	hex-0.4.3
-	indoc-1.0.7
-	itoa-1.0.4
-	lazy_static-1.4.0
-	libc-0.2.135
-	lock_api-0.4.9
-	log-0.4.17
-	memchr-2.5.0
-	memoffset-0.6.5
-	once_cell-1.15.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	proc-macro2-1.0.52
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-log-0.8.1
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	pythonize-0.17.0
-	quote-1.0.26
-	redox_syscall-0.2.16
-	regex-1.7.3
-	regex-syntax-0.6.29
-	ryu-1.0.11
-	scopeguard-1.1.0
-	serde-1.0.160
-	serde_derive-1.0.160
-	serde_json-1.0.96
-	smallvec-1.10.0
-	subtle-2.4.1
-	syn-1.0.104
-	syn-2.0.10
-	target-lexicon-0.12.4
-	typenum-1.15.0
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	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/matrix-org/synapse/
-"
-SRC_URI="
-	https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 ~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[${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/idna[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pyicu[${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 "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/matrix-org/synapse/blob/develop/docs/upgrade.md"
-		einfo
-	fi
-}
diff --git a/net-im/synapse/synapse-1.83.0.ebuild b/net-im/synapse/synapse-1.83.0.ebuild
deleted file mode 100644
index 5994cc671cbb..000000000000
--- a/net-im/synapse/synapse-1.83.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=poetry
-
-CRATES="
-	aho-corasick-0.7.19
-	anyhow-1.0.71
-	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
-	hex-0.4.3
-	indoc-1.0.7
-	itoa-1.0.4
-	lazy_static-1.4.0
-	libc-0.2.135
-	lock_api-0.4.9
-	log-0.4.17
-	memchr-2.5.0
-	memoffset-0.6.5
-	once_cell-1.15.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	proc-macro2-1.0.52
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-log-0.8.1
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	pythonize-0.17.0
-	quote-1.0.26
-	redox_syscall-0.2.16
-	regex-1.7.3
-	regex-syntax-0.6.29
-	ryu-1.0.11
-	scopeguard-1.1.0
-	serde-1.0.160
-	serde_derive-1.0.160
-	serde_json-1.0.96
-	smallvec-1.10.0
-	subtle-2.4.1
-	syn-1.0.104
-	syn-2.0.10
-	target-lexicon-0.12.4
-	typenum-1.15.0
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	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/matrix-org/synapse/
-"
-SRC_URI="
-	https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
-"
-
-LICENSE="Apache-2.0"
-# Dependent crate licenses
-LICENSE+="
-	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
-"
-SLOT="0"
-KEYWORDS="amd64 ~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[${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/idna[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pyicu[${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 "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/matrix-org/synapse/blob/develop/docs/upgrade.md"
-		einfo
-	fi
-}
diff --git a/net-im/synapse/synapse-1.85.2.ebuild b/net-im/synapse/synapse-1.85.2-r1.ebuild
index 89e8f254b825..50379e31f4a1 100644
--- a/net-im/synapse/synapse-1.85.2.ebuild
+++ b/net-im/synapse/synapse-1.85.2-r1.ebuild
@@ -92,6 +92,8 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
+# <pillow-10, see bug #909644
+# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -108,11 +110,11 @@ RDEPEND="
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/phonenumbers[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP},webp]
+	<dev-python/pillow-10[${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/pydantic-2[${PYTHON_USEDEP}]
 	dev-python/pymacaroons[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.84.1.ebuild b/net-im/synapse/synapse-1.87.0.ebuild
index bdcc5ad7fb70..eaec2f8d5555 100644
--- a/net-im/synapse/synapse-1.84.1.ebuild
+++ b/net-im/synapse/synapse-1.87.0.ebuild
@@ -8,61 +8,61 @@ DISTUTILS_USE_PEP517=poetry
 PYTHON_COMPAT=( python3_{10..11} )
 
 CRATES="
-	aho-corasick-0.7.19
-	anyhow-1.0.71
-	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
-	hex-0.4.3
-	indoc-1.0.7
-	itoa-1.0.4
-	lazy_static-1.4.0
-	libc-0.2.135
-	lock_api-0.4.9
-	log-0.4.17
-	memchr-2.5.0
-	memoffset-0.6.5
-	once_cell-1.15.0
-	parking_lot-0.12.1
-	parking_lot_core-0.9.3
-	proc-macro2-1.0.52
-	pyo3-0.17.3
-	pyo3-build-config-0.17.3
-	pyo3-ffi-0.17.3
-	pyo3-log-0.8.1
-	pyo3-macros-0.17.3
-	pyo3-macros-backend-0.17.3
-	pythonize-0.17.0
-	quote-1.0.26
-	redox_syscall-0.2.16
-	regex-1.7.3
-	regex-syntax-0.6.29
-	ryu-1.0.11
-	scopeguard-1.1.0
-	serde-1.0.163
-	serde_derive-1.0.163
-	serde_json-1.0.96
-	smallvec-1.10.0
-	subtle-2.4.1
-	syn-1.0.104
-	syn-2.0.10
-	target-lexicon-0.12.4
-	typenum-1.15.0
-	unicode-ident-1.0.5
-	unindent-0.1.10
-	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
+	aho-corasick@1.0.2
+	anyhow@1.0.71
+	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
+	hex@0.4.3
+	indoc@1.0.7
+	itoa@1.0.4
+	lazy_static@1.4.0
+	libc@0.2.135
+	lock_api@0.4.9
+	log@0.4.19
+	memchr@2.5.0
+	memoffset@0.6.5
+	once_cell@1.15.0
+	parking_lot@0.12.1
+	parking_lot_core@0.9.3
+	proc-macro2@1.0.52
+	pyo3-build-config@0.17.3
+	pyo3-ffi@0.17.3
+	pyo3-log@0.8.2
+	pyo3-macros-backend@0.17.3
+	pyo3-macros@0.17.3
+	pyo3@0.17.3
+	pythonize@0.17.0
+	quote@1.0.26
+	redox_syscall@0.2.16
+	regex-syntax@0.7.2
+	regex@1.8.4
+	ryu@1.0.11
+	scopeguard@1.1.0
+	serde@1.0.164
+	serde_derive@1.0.164
+	serde_json@1.0.99
+	smallvec@1.10.0
+	subtle@2.4.1
+	syn@1.0.104
+	syn@2.0.10
+	target-lexicon@0.12.4
+	typenum@1.15.0
+	unicode-ident@1.0.5
+	unindent@0.1.10
+	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
@@ -75,7 +75,7 @@ HOMEPAGE="
 SRC_URI="
 	https://github.com/matrix-org/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz
-	$(cargo_crate_uris)
+	${CARGO_CRATE_URIS}
 "
 
 LICENSE="Apache-2.0"
@@ -92,6 +92,8 @@ DEPEND="
 	acct-user/synapse
 	acct-group/synapse
 "
+# <pillow-10, see bug #909644
+# <pydantic-2, see https://github.com/matrix-org/synapse/issues/15858
 RDEPEND="
 	${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
@@ -108,11 +110,11 @@ RDEPEND="
 	dev-python/netaddr[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/phonenumbers[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP},webp]
+	<dev-python/pillow-10[${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/pydantic-2[${PYTHON_USEDEP}]
 	dev-python/pymacaroons[${PYTHON_USEDEP}]
 	dev-python/pyopenssl[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
@@ -129,9 +131,11 @@ RDEPEND="
 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] )
 	)
 "