gentoo auto-resync : 22:11:2022 - 19:06:54

2 files changed, 84 insertions, 14 deletions

diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 9f61bef81ceb..a87fcabad1dc 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -2,6 +2,7 @@ AUX synapse.initd 365 BLAKE2B 064dce5e10596316509f321de9819edab15fc91551e5fc9747
 AUX synapse.service 549 BLAKE2B 4b91a2da29b2a9afc5a6cff3c74a8b2f0dbe86063d0a47e60fddf8eb712b3642c308181ba2444a7e59b58f942368e7217dc94088a2487816aa44e28f49094573 SHA512 a9039c2883008c191cc89bec6f52893b489688e83525eeef09a979fc22b09b048cd03d6a7a450ac3d1441abccdcd6786cfd6c8f0b90ea98d1516c312bf634636
 DIST aho-corasick-0.7.19.crate 113070 BLAKE2B 5ddaa0d415d19cf9922b5723bf3480750634ea68cb66fd05bfa2bf57607eb6383ba86d8c55f70adb87b71b98caa73d8f6ebd075c006493530c81979032899b60 SHA512 0d63d29079650bde4e8a9f8529716b9d8c42db076a1d74715116240c2628173f1e86fb29c08a25ad07a0148e48789ab20de0c186a8b3dfb193cbfeb0d76ae78c
 DIST anyhow-1.0.65.crate 43585 BLAKE2B 4a808e60ffed900ef37d8fbf7ae97caec6fb81d23a8a5411c5c0143636652c41a9579b156ead5eab66d57c53be2bbc336cbd5f7b60c6c20cad389d45861d82f8 SHA512 86b83c88fbc343f4ff1bfba5bf91f3c5133fbed8276e78f4222b28e38ada79c4245e2780934897525b41cbd4b8a9d0bc9cbd8b6c2dd32544ba124d458f5a490c
+DIST anyhow-1.0.66.crate 43770 BLAKE2B 8d74397c47bd64c00f015cf7ee279fa020ea39191440208d77e4a5fdb35fca531e8bb9b765be223b24050d0fd1db76fa5b516146f450937f84a5c113c9eca997 SHA512 7b4078906df2805d491dc2f29c4eec85a9f43078c0dcd9c05261c2706ed655953b693c4f59fda62547681b29cda9ac7a0789f1359bb18110403cfe34e9fb0dc3
 DIST arc-swap-1.5.1.crate 66157 BLAKE2B 9060ef4f9d699fadc03be1a116d9301f6308fbb7f8bcad6f01926d584386d26d03f9dd2ea35b6771a6725ee7819e028d0e1b256e8b5f3b812cbd388e757491fb SHA512 8636149e92c068d5ff5352a19c9973e7bf2aba68b9363c783178903a8665f6edabbd30c25ad7992646635efe5830d67c958f8d41b44a4ed1fe5698628b41c074
 DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
@@ -47,16 +48,19 @@ DIST regex-syntax-0.6.27.crate 297300 BLAKE2B 4ca1a2e23d04e29c5925085ea4ab7ebcc3
 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.145.crate 76568 BLAKE2B 2d38e4ced18d204d8c36122ad09fc00f0378c7e9014d3bc67fb7c3e5ab0f923aeabb6a5fefc8699e80e220b12601d01dbe3ae5267a124164bee2e4d9897aa0fd SHA512 8146c39249ad54028717bcfd916fa5abd8b1ddaec54c4d0de485bf10cb6a85676a53068a07b9563e1717fedb4746ef672ae0c285a8998543cf92d7a157f2d442
+DIST serde-1.0.147.crate 76697 BLAKE2B 90fb2df19ad225c96a30cf88dea82a5785bb110f256b882cadef8d1e09f91dd610637a104c2e7629847a14d4a422f89f7ae324c29845788aefb0a6bb51503886 SHA512 d993bd86c61bba602faf7286ff21d36c5d8c83176c5bbb203cb284a3f89dbc8a1ca893a09eb2657f9e98ccb5c5287f44aac06d2e60db96e78d99ee40bd1fe1b0
 DIST serde_derive-1.0.145.crate 54860 BLAKE2B 0c80f1b8844e044bce28c3fd8e46ac732de21736622fd7b2235c41d9a909d7ad224e8e7ba5fa3e5de2cfba5e48a4116f97e9b7eb31b0201c01bc98d40a78d16d SHA512 267389f8cd6d3a7b7d4a4d3226346999294e2fbef7446ff1cd1183dfb4fd17409f5891f6c2cae113b79cffdaca07f2037fd2f4108f93723e6baa5153bb9a61c6
+DIST serde_derive-1.0.147.crate 54861 BLAKE2B c758a3c854f1474dd3fadd66d60a59408e30d5b658cde4c7ceb10c8d4b4210c8069cc13618f83f1faf36de928feeeb82b2f7011b457e8b9003a15177714f9c0f SHA512 434d65dc0d78c7c1c3f8832221389dc4b0c5d74d605ce1d2d660c2df9a92f5e5d0c6d543763e1462c58d6ea18001c823ca594e3dac92a47d8fe48319a5c52e59
 DIST serde_json-1.0.86.crate 144680 BLAKE2B 666aa0fd8956966aa4bdbfcd88699ae3ab31ec4ad3041c4c3c7b66a86b79829c17d937b0d558a0c34754e10b15cc2100c10e5479302b4af3efda73df73287845 SHA512 86922c40ce32f03c5128e899ce161e186dc35decd3e0672ed347a82f59452f2a3ba0284c342548b17e4b8dba7b13a3d98749ae8981c725ee853537f6e6b40092
+DIST serde_json-1.0.87.crate 144383 BLAKE2B 357ee30245611b15bf98ba719266dedc75211a80a660105756b20d52f50bf4032385b366c3272cfc1c7f34022e818cb6a6af799faf76f8d5969c256a02f9187c SHA512 77b90340aaaa0fb477b33e6628ed2ea0fb53cff1e2b5724a3474e24b2bfc9bff077633d9581e41dd96b2a0e167549e992d238bb09c627fb5680996b39583c4cc
 DIST smallvec-1.10.0.crate 31564 BLAKE2B e3e46a0781d3a7892a739b001592d462d0704f010363984c439e3fe4f75aecb9720648aa1e9bcc56bb3be848dd40cee578212439f78f07a807c9441c3c3e0147 SHA512 a09110184582dcc01d7a0d3fa8f74c17bf726935126d3654667b8e9c4bc43ad16ccfd8fa94feae7d9b31913aa7ee030fe5936e4b44a36302b6ce5fe37372a7ae
 DIST smallvec-1.9.0.crate 28396 BLAKE2B b04100f0a8db9e7c34a425e665242772c9857c5a4c5f34468a3f1b14f669d5cd21de2d54dc5295a22f52032370e8e989fc61cea3f4e6574ccca5be639c645e74 SHA512 e7158393d4257564eeb8fa53a630fdfc13edb33f3c555e41606edcfdbe9189e5c59c25d255dd21d02d4abad1ab2931e21744ec6c2f91ad4db66f87e748a45e56
 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.99.crate 236084 BLAKE2B 852493506271ee364ecb6e907fca55f18af9dc7ec4b4737e43e104d04064a37a2a59b31f5f780621785e44606d43e74adca5cf24c9ac1a8e186955c6b3e43b85 SHA512 47a9ec4d5e6702709c1069d1804d29880a1c5bbbed5a91c44e80eec657c62ceb223d6fbd942deef591463664766ae1997d154525f4e7a212bb84151418f40d10
-DIST synapse-1.67.0.gh.tar.gz 7933047 BLAKE2B 8fd6b48198256c8cbe4a2a1d5215e1eb34084065056dd251a19b01c44e7f193b612f49a8fce74498d406e338dba3c6f4a0db384f323d5e4174d181de8478ef24 SHA512 913335b3815ff218134cda80d7149a95aea69eda170e9da6d7566213f077692a92b0276e2530ae4e69572b13124de28b6546a7322b3d9e65f676df0ca4cb9469
 DIST synapse-1.68.0.gh.tar.gz 7961362 BLAKE2B 9822e5068aefe9807946b25b6a04142c8b506a165349e8bf5d8c45227e0959331d13870f2d2ddb5925ef8892e16c6a35002e4a091814fddd73a0bf03590278d2 SHA512 fc31ba2c92ab698ea54006862021f855cc1011a6d7a9d8d42e2eb07bbd6f9f332d35c68fecc43cb543530da7dba6e83d0e5379c7e8dc91bb48f228d509a9f584
 DIST synapse-1.70.1.gh.tar.gz 8049336 BLAKE2B 12b7b68b004915b56ab76965c0d9dae3e97e236891d2df1f5cf1e8bf9dea269b0df7231dbe224af81ea190822858a0a393785676650e4e58b0727c0f8e8e8778 SHA512 6e0da78d21a1f052ee12eb5e614be4bb25efdcbd27775209b93dc386b0f35f2c7faa6233bfb81901bbe225f802f7ae6572022f467366027a45865ca1a2f88dec
+DIST synapse-1.71.0.gh.tar.gz 8076599 BLAKE2B f9d5fbfc3d34781bad8629cca69f70f500f25e3e0f1178dae71c7fa145e518fc02e7bee91a424a2f8a3335fb6574ad206f4b04ebd7f229c42317994b03d06901 SHA512 646b54287dafe9d6ed93505a7f392c8551889c6088a78076d89cf5e197aee1d5dca936d463cef81b0cc20026c88ee5bfe63199c206218a05d98e29c9c157e5be
 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.3.crate 35031 BLAKE2B d8d20829b97e7f1b9710feb6773cc5c4d25de6509772491e6f508a489285e32ec3a14ae689a1f1cd01ff5e2d4301b98579155535e03e240c8605b5737c9c5de5 SHA512 7ebdcfd7131a0e7a834f7e973b9cf813495259e0a0606539623d3f9bb51f9c6414908e71281d6a77397021e48d41c400a704c65990aaa8ca8d0a6095d9b3ed47
@@ -69,7 +73,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.67.0.ebuild 4021 BLAKE2B ca1bb25dd3a2c6bedf6ddeaafda7a5d992a9818d329832851cfab73e33452456f0e8b29528252d701353cbf303336d2014a819428e033187a2598ab1345bf39d SHA512 ad961008127dfa62d9fa816b6225affd00d257899fa62994fded820ebcc7446e9fe0436a0b2063bdd9a5a2bda11a20b76dc874502a235c5f42309a7aa82421f2
 EBUILD synapse-1.68.0.ebuild 5082 BLAKE2B cd32cc245580bf72428df2b0c2e06517d962aa571a7d9213585fc90463952c5a29c1dbe5672825005b27c58b13f22db08dd14b2c381973646dd9dbdc9731be20 SHA512 af4de4cfbc19bc0314dd6029709482401bd58956559ad1313fea1ce231a9bd9077ca0e9cac3cb4ad363ed0a17d155547817a8f179bf3ef3f816a1eb9129008dd
 EBUILD synapse-1.70.1.ebuild 5367 BLAKE2B bc995f732f0dd11730b6d2c5fec9f552443fc0c4ed0a94329e421bf061b6750999e1d2f0aaea9ff7a81c65b3006c610119348ae5dbbc73e75b5c26591c85a47a SHA512 72eb882c694a897d6566c9be7995a44349112a94016f4527a9e99f54d3b62615a8be7dc2871bfe50afd1b303e616041a776f6810b8ce183e04ea7a70865c8771
+EBUILD synapse-1.71.0.ebuild 5367 BLAKE2B b7d9747dac0a2d423ffce675df637e96ca59deb3b1fae6d19f92d9b3e9052c49a71cdc892ec166ec86dd6dd59a218f84ca93a90e691fbe2e238b9e12f2350fa5 SHA512 ff4f82789c4ce89dee8642daf33650b1a18831e55af22751aeb8ec0d9cb3efc4d8d2e1e63ba8374a7499cc7a4460ea12227269c0391e9da9b85f789a5430c9bf
 MISC metadata.xml 474 BLAKE2B 1e990bd0b3e6234f15e2e036ca6c9157b6bb27c36542e24d5e80a5f2a8dc04a592ee267869869d79bee00177ac8c11ddb630483d802c3d6be49317d41ea41cdb SHA512 6447082bda7509c395fc60bd23fb506d1d61cc0d6b89aca7d68c263270bb7d941f3ea95b18f428c301b0f0cd536688856b85ea264b0facea7cb5d51bd5909c46
diff --git a/net-im/synapse/synapse-1.67.0.ebuild b/net-im/synapse/synapse-1.71.0.ebuild
index 034f411e15db..77fbec1ec51c 100644
--- a/net-im/synapse/synapse-1.67.0.ebuild
+++ b/net-im/synapse/synapse-1.71.0.ebuild
@@ -7,26 +7,84 @@ PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=poetry
 
-inherit distutils-r1 multiprocessing optfeature systemd
+CRATES="
+	aho-corasick-0.7.19
+	anyhow-1.0.66
+	arc-swap-1.5.1
+	autocfg-1.1.0
+	bitflags-1.3.2
+	blake2-0.10.4
+	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.46
+	pyo3-0.17.2
+	pyo3-build-config-0.17.2
+	pyo3-ffi-0.17.2
+	pyo3-log-0.7.0
+	pyo3-macros-0.17.2
+	pyo3-macros-backend-0.17.2
+	pythonize-0.17.0
+	quote-1.0.21
+	redox_syscall-0.2.16
+	regex-1.6.0
+	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
+	smallvec-1.10.0
+	subtle-2.4.1
+	syn-1.0.102
+	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
+
+MY_PV="${PV/_rc/rc}"
 
 DESCRIPTION="Reference implementation of Matrix homeserver"
 HOMEPAGE="
 	https://matrix.org/
 	https://github.com/matrix-org/synapse/
 "
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/matrix-org/${PN}.git"
-else
-	MY_PV="${PV/_rc/rc}"
-	SRC_URI="https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="amd64 ~ppc64"
-fi
+SRC_URI="
+	https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	$(cargo_crate_uris)
+"
+S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="Apache-2.0"
+# Additional licenses needed for Rust crates
+LICENSE+=" Apache-2.0-with-LLVM-exceptions BSD Boost-1.0 MIT Unicode-DFS-2016 Unlicense"
 SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
 IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
@@ -45,7 +103,7 @@ RDEPEND="${DEPEND}
 		dev-python/ijson[${PYTHON_USEDEP}]
 		>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
 		dev-python/jsonschema[${PYTHON_USEDEP}]
-		>=dev-python/matrix-common-1.2.1[${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}]
@@ -70,6 +128,7 @@ RDEPEND="${DEPEND}
 	')
 "
 BDEPEND="
+	$(python_gen_cond_dep 'dev-python/setuptools-rust[${PYTHON_USEDEP}]')
 	test? (
 		$(python_gen_cond_dep '
 			dev-python/idna[${PYTHON_USEDEP}]
@@ -79,6 +138,9 @@ BDEPEND="
 	)
 "
 
+# Rust extension
+QA_FLAGS_IGNORED="usr/lib/python3.*/site-packages/synapse/synapse_rust.abi3.so"
+
 src_test() {
 	if use postgres; then
 		initdb --pgdata="${T}/pgsql" || die
@@ -91,6 +153,10 @@ src_test() {
 		local -x SYNAPSE_POSTGRES_HOST="${T}"
 	fi
 
+	# This move is necessary otherwise python is not able to locate
+	# synapse_rust.abi3.so.
+	mv synapse{,.hidden} || die
+
 	distutils-r1_src_test
 
 	if use postgres; then