gentoo auto-resync : 05:02:2023 - 21:17:55

5 files changed, 54 insertions, 56 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index a77bc7b20aff..c33371b8677b 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 2e3e76cda4d8..a8925580ff03 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -36,25 +36,22 @@ DIST pythonize-0.17.0.crate 10949 BLAKE2B 6d3c311aae1ef97a2a965124eb23e312f94c4d
 DIST quote-1.0.21.crate 28030 BLAKE2B 547344ba9272874f5fbb4bd27a69ef5be99823e10e1318afe71971b18f37e9c73d54168f16efb82c53a332e4874c80a82ea951fb2c85fad50cdfe783622b79fc SHA512 0728eb4df7e1f7c4d32ab08c901c2c969db8eb46b03bcec3e4956a4f6b360939d32abc6b6ebd7a31058e8e9b69c3d995a24cb484f93656f05b4ee963be1c74fc
 DIST redox_syscall-0.2.16.crate 24012 BLAKE2B 9497a52044458b1435ea16e86ee072e379b6b11ee31602ea72d6b6072a4a99426f409c2e58108a4e9c36dc193fa49c83951e71f4fd4e158eafff18c594dc01ad SHA512 63b5d876baaf99f5cf737679bc6ac7a9e3d8a41aa93f5c59416ce7e3841e2513bff678773553cfe62fb452707f82acc384ea63aec932a31bf94679cd1caddd27
 DIST regex-1.7.0.crate 239421 BLAKE2B 6e9434bb9835bd8e15c81e817aa64e8443c4188219caf46579078c6b7cbd98ee588af0f526e0fd5a01814762dfaa113ca3d15f7cfa14e969d5acda3a631e9560 SHA512 974c15a593d86c33e0bb34f7a67957fe96dec07b3752f2b6b968d657845f5d2342a5ee9ec1359109c43e4f46c9b2b2b678d59f7b752455a0ab1435c1fa56ca3c
+DIST regex-1.7.1.crate 239648 BLAKE2B d68591ab0627f0bbcead8e81de2b9f6c7eb7be2d29b2c1700e06ffb541c073ecc054dfc76aba8f55ac0630b191d4136805bd04c7d1b9f6cbb1ca2437668ab244 SHA512 ee19bc6d24b981a151324ad4115488383227ec33dfba0225b35b6252f0d363b8d906db59a45170139c7a687fe681a983c2392d2921c7365db38c7c0e9745066f
 DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc398dfe135eacaab1e686aa8be43a110a28e8bec05a6910183f9a6bb1fd0d635fcb1a60b5a6a03fed4d2cf937a542a5a SHA512 5cc705a5dda08cbdb4dbcf3fa98763cadcda13d9c3ba407b35f3e88d77935efc2704bb40b3fb5aad7dfbad0df43bcb4c4cad9732defb954e2228a0739f7c37c6
 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.147.crate 76697 BLAKE2B 90fb2df19ad225c96a30cf88dea82a5785bb110f256b882cadef8d1e09f91dd610637a104c2e7629847a14d4a422f89f7ae324c29845788aefb0a6bb51503886 SHA512 d993bd86c61bba602faf7286ff21d36c5d8c83176c5bbb203cb284a3f89dbc8a1ca893a09eb2657f9e98ccb5c5287f44aac06d2e60db96e78d99ee40bd1fe1b0
 DIST serde-1.0.150.crate 76864 BLAKE2B c92b536f7fe8b4b8e0707f994f5d828e87174fb847179bd58b4267c5e806b4277cb82040ff2114938b90954e3d851a9e402f90f46ef242c1c9caa8da98895fc2 SHA512 317bdfe4ad597af8e081ffa3123987448ed56953aeea195aec1655b9053956c906c888cdd287a6f2e86e6e99ef75103e26ac4c84e805016301236cc5ed85344c
 DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e1d6085c58a75269a9b43401e2cace080c4c93ee51982855fb7e2f09fdefe9bd237bbf30c5537f3a4258283b SHA512 b47bd58fdc1a81d96cc0c9d14c8b19153b6689e893851975b1d7c7010c4448750e7fa09056dd4f13ed475a4aea2a3950952ff528832976919a6e78504a37bea7
-DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
 DIST serde_derive-1.0.150.crate 55565 BLAKE2B 1a1827b2d131410ae853a82483da0f80369fe0aeac2764128cb3c416b92a128b1431ad3313c2fd9a46edc581ff3e4752f4e6bd7c9bc1ea688d1aacc74c1ec669 SHA512 7282c65063477d0e9492b9d80d34f089bbceab422408daa1651403bd6e3f8a31b854cd7a588ee475e7a005970d173242083865847b15cd5ee231fb7d8c12b98b
 DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
-DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
 DIST serde_json-1.0.89.crate 144638 BLAKE2B e296fd2fd3054b81349f246d207de4f7f8072e480a34f1c39afc2d46cdb6b861d1514a8bb64f2f68920e8db43b642814f7f4e989dab95cee62485ca2f8db2e8d SHA512 4bafa5693977e129f5787f2ff10f914e2a7740bf7e631bcdf51b27d0d9e5517873184b56649914371e1881107e7ed0a8fedf487617db334d4a7a4bf95c6c16a3
 DIST serde_json-1.0.91.crate 144654 BLAKE2B 857f25cb43f8153ed4266fdc38b0a426ea04edd9e7954ceeab384729abb51ead1378a819eca6ced5cf20ed0cf237548b4c81ad507e3f4684aeb9bfd7e4958684 SHA512 b0bfa3d64fe9fb0d09ec8dcb6e41eba75ad0f0c4e34e0ffd5e2a3230057d7499a57ffda8c1615bea5195ef398afe414f3b0a143a39865123c1c5f976ea1a0337
 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.102.crate 235699 BLAKE2B b29d1b0ab878eda45c486bce03e1b341eb2c69718201e662d81c131ead2bb5c5abffad848d9cd8d2e45a995dbb4d6a185173b5680973971e0c33bdd9fe43dfe8 SHA512 c9a2b2cf216c3d821decd488ebb49743f2f43940a879856e3a15d2352843c405e6f164c11225e904d18b32a5cd2bd7fcdfa74df40ec5567faeedffe5f523989c
 DIST syn-1.0.104.crate 236683 BLAKE2B 865904923ecac469f1d92bab04ea9ee384be0592c7a303d9d0f2f4bc755744bd883372c215a8f1add8bc2728d7c2c27489ab292fc8a89bdce918fc4a32deae44 SHA512 8feabd8e6b1b5eb15077d7c92f0b3269e848d33b1f233b3df343b6d445ed332fb23e0222911a13edfd82cee969d25c43434268cd7a20ce1c0a608a1bbe327b29
-DIST synapse-1.72.0.gh.tar.gz 8090757 BLAKE2B ec32587f5cde37a8164f747cba64c0d003c1f99ba2518540bc9b2811710df5638e643405e55bae52d444c5b2ae4777f83f2bbb32b72b85d5d38e65b563bb1d4a SHA512 594da58366fa4ce6eefe2228c84fe1c2b9ecdfb5b80aa5e081c860760129b825454b7c3f10a9282d3054af0185e924746ff659c2e53f229de008f696238285a5
 DIST synapse-1.74.0.gh.tar.gz 8120920 BLAKE2B fa1643bc6153c475577e56477b616b287e8eb199d49cd9bc9196dc4b1d3a53e51c58e69597c3c2cb937bbd5f43a4b4534fabb4f7a47e9fd57ef68c488d9db694 SHA512 89501c93c60a9575685ad8cbfc141c0acd79ce59e151ac27dfff9691191e4c12ff600402217831b936aebefa77bbfa1db142c4f17d8517e73cfd28f7ec46550f
 DIST synapse-1.75.0.gh.tar.gz 8136760 BLAKE2B 95ae793f567c6e7b8e808f446f69a84a2cf2ca977e0067bc8d130670c78e0d9fbd4aff8ab8b144549c3e74929fc1c1983ad583a55027c53bc8a1b75932bfb322 SHA512 c8d508d10f2820b90069c4d87f5b260ca56ef9f9e91137f87a071d92cdd3d9cf2a16bc065bdc53dee2f021290228d96f8107bcaea7da8c9a5a49271eaae04076
+DIST synapse-1.76.0.gh.tar.gz 8159151 BLAKE2B 2ebdf1f4a38957fadd4483356c14747a7046736b893949694e0a663fa3ce2f576cd54000b5e6c6f8880f6277dd7116c2e50217c801edd292b776d745b7a3e3a4 SHA512 c29d4f0d91c415e5bf908e06892e631c04bcf774cd2d699cac919e86fdcfac4c0ff2a75832738b3c874b8fb6126f31dec5d038dc4d126f05c1ca0fba5583d91d
 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
@@ -66,7 +63,7 @@ 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.72.0.ebuild 5353 BLAKE2B 58b7f25ff6ac32fbd98ee58af0ab6b2bdc907d01e97a1772164945b29de1300c6531abcd5d11d75351b837943230d5b8d3556595cc0916ad189a5061ca862670 SHA512 efb6d59a560108ab031bbdf06d20dbb0e39efda13903de5c71546ea6fc45e23fc4d8fe09f1b2e3e1d10252c671cda8c5ef44b28bcccb8ec0dc2b517fc2e46c4a
-EBUILD synapse-1.74.0.ebuild 5287 BLAKE2B ca4bb96962eec0ea161758b4d907ae0daf912e91a1ae9b5631711d6655960354b54e8f81044c398e7be10a09a87f42f9e5f7565f6e694dd674d57523ec71f290 SHA512 a07ed41ee89eaeed92d8e0a128f03e7804d255e3d687afaaef17216a6f2c1d47d0c4300b3bc05301cd85d841e17a6f0b2fa3bd3272e1bda3f0edd3d3ae5370ea
-EBUILD synapse-1.75.0.ebuild 5288 BLAKE2B 260c847b6dfcde885f21447ff652b22cfe98a5db4f52aa90fd52dabf14a5838b7bf71a172d4863b440e76274bd50a5dd07bcb1c8eeab5bd98e45035e6f794aa1 SHA512 edac29d9ef6f4e69ee59dc1b65dc8ffffd0aaed5a9352e6a53c9f81c5fcee3d545fb19b872e4147ecc0e96565da3e75c866aef8429c90af1f9bf1b0a9d15eb53
+EBUILD synapse-1.74.0-r1.ebuild 5336 BLAKE2B 0cd2771214930a4bfd259625e6daa9419e5e489e9c1d0fe331801004798a8e1eec069999857f7e282e4155e4691009dff0be672995824cda11f1058e1593c03a SHA512 d3d5f30b0eb881381bf02a2f3c64d956f5d57aaa867c121304d8c9b8424cd236e023f1342379a629b86d689321f1c3a89d187cfc970e5c8744debbfc8f3da09d
+EBUILD synapse-1.75.0-r1.ebuild 5337 BLAKE2B 1c7a52a17b15b97af8c659c2a186eec4b172c2a565a1d0220714a04d3985e981ec24a2a8e8a4f26ce9597debe33d3dbda69d3e3932351476b786a5b181e94147 SHA512 acd8f0d285cbd2b978912429dbfe8e5d67d0b22db730c4e4ff7a317b122427297607976185fb9141af0358b7e4abf8c1632ba847aafa97eacafab3ed1c534233
+EBUILD synapse-1.76.0.ebuild 5337 BLAKE2B 6eb84b5752393d0d3b03aafa75c77cc79f7b3210084ac5b696e1fa0e0e846f45387855aea19d7c2c042c36e8e5f1974fac546f07658d63f180c73f0e04a8fd04 SHA512 7916eea5e3f3826681af0f7157055645b7d606558751cd6405ad0469f4bd62e87ca1bf231f2eda82cc0506c5f8cdc8ca2de703a7e1de5ac1d7131c73fb79ee53
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/synapse-1.74.0.ebuild b/net-im/synapse/synapse-1.74.0-r1.ebuild
index 2d93428cd56e..660bdd799cb3 100644
--- a/net-im/synapse/synapse-1.74.0.ebuild
+++ b/net-im/synapse/synapse-1.74.0-r1.ebuild
@@ -127,6 +127,7 @@ RDEPEND="${DEPEND}
 	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
 "
 BDEPEND="
+	<dev-python/poetry-core-1.5.0[${PYTHON_USEDEP}]
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	test? (
 		dev-python/idna[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.75.0.ebuild b/net-im/synapse/synapse-1.75.0-r1.ebuild
index 3b0881903314..db822497a82a 100644
--- a/net-im/synapse/synapse-1.75.0.ebuild
+++ b/net-im/synapse/synapse-1.75.0-r1.ebuild
@@ -127,6 +127,7 @@ RDEPEND="${DEPEND}
 	systemd? ( dev-python/python-systemd[${PYTHON_USEDEP}] )
 "
 BDEPEND="
+	<dev-python/poetry-core-1.5.0[${PYTHON_USEDEP}]
 	dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	test? (
 		dev-python/idna[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.72.0.ebuild b/net-im/synapse/synapse-1.76.0.ebuild
index 482ac034d693..69a3111edb72 100644
--- a/net-im/synapse/synapse-1.72.0.ebuild
+++ b/net-im/synapse/synapse-1.76.0.ebuild
@@ -4,16 +4,15 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=poetry
 
 CRATES="
 	aho-corasick-0.7.19
-	anyhow-1.0.66
+	anyhow-1.0.68
 	arc-swap-1.5.1
 	autocfg-1.1.0
 	bitflags-1.3.2
-	blake2-0.10.5
+	blake2-0.10.6
 	block-buffer-0.10.3
 	cfg-if-1.0.0
 	crypto-common-0.1.6
@@ -41,16 +40,16 @@ CRATES="
 	pythonize-0.17.0
 	quote-1.0.21
 	redox_syscall-0.2.16
-	regex-1.7.0
+	regex-1.7.1
 	regex-syntax-0.6.27
 	ryu-1.0.11
 	scopeguard-1.1.0
-	serde-1.0.147
-	serde_derive-1.0.147
-	serde_json-1.0.87
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.91
 	smallvec-1.10.0
 	subtle-2.4.1
-	syn-1.0.102
+	syn-1.0.104
 	target-lexicon-0.12.4
 	typenum-1.15.0
 	unicode-ident-1.0.5
@@ -82,9 +81,11 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0"
 # Dependent crate licenses
-LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-DFS-2016 Unlicense"
+LICENSE+="
+	Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD MIT Unicode-DFS-2016
+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
@@ -93,47 +94,44 @@ DEPEND="
 	acct-group/synapse
 "
 RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/attrs[${PYTHON_USEDEP}]
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/bleach[${PYTHON_USEDEP}]
-		dev-python/canonicaljson[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/frozendict[${PYTHON_USEDEP}]
-		dev-python/ijson[${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}] )
-	')
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/bcrypt[${PYTHON_USEDEP}]
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/canonicaljson[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/frozendict[${PYTHON_USEDEP}]
+	dev-python/ijson[${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="
-	$(python_gen_cond_dep 'dev-python/setuptools-rust[${PYTHON_USEDEP}]')
+	<dev-python/poetry-core-1.5.0[${PYTHON_USEDEP}]
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	test? (
-		$(python_gen_cond_dep '
-			dev-python/idna[${PYTHON_USEDEP}]
-			dev-python/parameterized[${PYTHON_USEDEP}]
-		')
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
 		postgres? ( dev-db/postgresql[server] )
 	)
 "
@@ -178,6 +176,7 @@ python_install() {
 }
 
 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