4 files changed, 210 insertions, 4 deletions
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 8c432cb3c115..412cff6d1167 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -43,11 +43,13 @@ DIST serde-1.0.152.crate 77091 BLAKE2B 89c01ce359042ebe6b1b64ea710580886f965a98e
 DIST serde_derive-1.0.152.crate 55586 BLAKE2B f133c6cdb87d435ea0c05144e685047fec22b93df7c61df4aa139358c2732326c98d0f62fda629da0f648aaacfc9d6f312813940238f45b359546dd435e7a516 SHA512 2f4dffb5671b4758f0b7dc0939f6b5cfe3b3ba02a53c62c75b5a0ec89d2db26bdd95f3e269d1fd4b07ec921bc0ca5f0741c26fdfcd25bd6532ac698c6c701e91
 DIST serde_json-1.0.92.crate 144180 BLAKE2B ff8f7ae5539c7febf542bcd8c97a47b5b280d650edde368995e2342f037a611f87d7b42e0dcf7ab89033dbc7fc703f9189bf4022cde6982935690b510585ac10 SHA512 4fa760e4105484af6def828894a216059f037ca0286555e4f1ac56e9442ed781bb4ed5c286d264910602992d66cda0d0c15a077d394c21b148b39b389d2f1ee3
 DIST serde_json-1.0.93.crate 144383 BLAKE2B e2a824632240f60b51d574f8b44675a38a557e917ac66e7960b303b493604dc369a17870228582bac93faa530b80ecea02b4d5d10ad0b18ab8ce2494ac4154d3 SHA512 b6e6f417466f6715a8cb30df2083a82dda794e9fd5fdb1e0b9c97ffae40bec57878580385da0c0e9e5e3ba76aaff629a9dcf40485aca9a288dda2564093d797e
+DIST serde_json-1.0.94.crate 144406 BLAKE2B cb4098da36ae5792e8c8e129e3148f27a4c646a57f3e59fde75febe252de79c8e1b310d947c2fb5ed7ec75e68b146f61b0b1d31dcc6f510ac61a37f64a47afc9 SHA512 0c85ccfce884a12dc7d57c110de4c96994f84e6a23ed28b9d38c9ac53ad6be506ad414735bfbd4d90fb49ea087460bb9da1929bb3aad7bbfc518b812ce92516a
 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 synapse-1.77.0.gh.tar.gz 8180884 BLAKE2B 1a5ee318e005384d80e1ae0d3d1dfe035263b13b88cdc3319f5eee4f9dd1c51b203bbc4bde9035e82bd976ef7f4314c6ae62601149227557745723c07cafc0fc SHA512 7e9efda255e44efb1916c903ece4d6eacc4ee069d4415bc0bd2723aef655101cfe40be9cfd1a321b1f434e6df0482c792d2dbba8b6c05c1f1ce14cac0a16926b
 DIST synapse-1.78.0.gh.tar.gz 8215627 BLAKE2B 22e3cb1ef7349548052c81ec09b715848a061bda9fc56563733e292403b975a5ceea0be0b3f39b0f1effc8e25c775d59d4db273422530ccabf2a64ed786eadc5 SHA512 fef3bdac42fc8ca6a8642eae840edaba789ccbda78b3a749e90ca5785e232a5ac9e8a3185dfc27f7c6f6f7fdcdb28b53483f884df0b3fc7f7ba9c18e73350698
+DIST synapse-1.79.0.gh.tar.gz 8230631 BLAKE2B 7ee06ef19b6a00022d26f3a58c91eb0b5dd2471e7e2cd0b90b8e6ab4b08ffd07b051aa472cdca1d8c6cf31a98d851fdce42fd45258b978e2511a6b6664217d8b SHA512 0ba9e0513ee4eccea7de270c9d3e4775b044a6815bb22b5b12cf4d36b367fb30cb3e7be0b7c0e1c8634e439acc2b5b37e6ee40095f48e089502cb648b91dabdf
 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
@@ -59,6 +61,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.77.0.ebuild 5287 BLAKE2B da180755b2755fa3987d3f4127c04e76fb254357adfdf5db5bac7ddbcc81c564b3d758319312e5e36086c43073f11b7f66ce33280bf7a0627d4062037268de97 SHA512 76b971c8fdc688aa25490c0e697e8a9f8323e3c7ff96f655f9c90cb97495bc33edcedd6294ddd1739b47b5a6379a6ef1be8d6667d2a9605cb8b11a5e39549e2f
-EBUILD synapse-1.78.0.ebuild 5346 BLAKE2B d06744a3a475d91b79256387a4e0c29469c7161967d4b067df74e7eca044ef788205fd2691f93e8dd9bb2f7564decf4e069fe8f6643c5eeedc2f69589dbc793e SHA512 5c0a7e7315c4cbe54331938c54319c349a9e4fc51a269a63f2267d20c1dcbe71cea6b32144321b186eaacdf6b76b7d5365b19b0aae88dc5e78c085d5c976e1ed
+EBUILD synapse-1.77.0-r1.ebuild 5290 BLAKE2B cfefaa54af30439f3a245272a9076629b71915a7df67cd7db001c5f88f319b1aabef7a965dbf1132f2514148477f12f509660c529ada92b87898600bd0f9caf2 SHA512 8fb5778e6fac5eec0bb45343537bc60eb316f71ccebe7c29f4b22b8960c911858dafd70c1b48da748e0295db8548922e3cefc64c7b8a0b5eff6dd7b2ad6c2284
+EBUILD synapse-1.78.0-r1.ebuild 5349 BLAKE2B 8c34cdcd7833c335018d5c27a9e45a99aabaa2ebc856d31c100caeacedceafeeb84c255ba74db820ba0545befd37832a1dd4b438d64ab90a1a120f40cda8efe2 SHA512 66b95c3f2483aa66122556c69e66c43ff6b1f3822696335e751cfa54bd51c551ad5d04b8130b4faf9617d55a617da663008db7f2e99ecfec1adf14d86560de69
+EBUILD synapse-1.79.0.ebuild 5357 BLAKE2B 09568a085abc854b0e72e2eb7721d73e93e3ebb75de36c2ecd999d514585756f79825dbc43d36a548b1c3ef2b2a38865de3c168f296883572d693a7d5701bf0c SHA512 4b1a251bc87dbfeebc8549e2bc7620d5bf7bc8d5793021be8055fde7e895f788d82a4ea7ee52b8ad4c3f71634c1c9a85e172c0988fc0faef0882ec19eacfaac4
 MISC metadata.xml 526 BLAKE2B f76d0a86c40485c2428fa949fd54650f31696ce94f0d81bfea53c13604ec287230ad2fdc094f767703ecf3864e111e2b89b091fe766172ab63e809df2a7c95ab SHA512 fd5d919dd64dc2d3d2a6be8d7cabe83d722936f27f2cdcf351bbb4a7e862b6a64f94c2581a71ac27052d21595843ce61a8c94e6802c8857bc310187b38544456
diff --git a/net-im/synapse/synapse-1.77.0.ebuild b/net-im/synapse/synapse-1.77.0-r1.ebuild
index 36f84cc645f5..b8e7210085f9 100644
--- a/net-im/synapse/synapse-1.77.0.ebuild
+++ b/net-im/synapse/synapse-1.77.0-r1.ebuild
@@ -97,7 +97,7 @@ RDEPEND="${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/canonicaljson[${PYTHON_USEDEP}]
+	<dev-python/canonicaljson-2[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/frozendict[${PYTHON_USEDEP}]
 	dev-python/ijson[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.78.0.ebuild b/net-im/synapse/synapse-1.78.0-r1.ebuild
index 2da15407303b..9b508939ceef 100644
--- a/net-im/synapse/synapse-1.78.0.ebuild
+++ b/net-im/synapse/synapse-1.78.0-r1.ebuild
@@ -97,7 +97,7 @@ RDEPEND="${DEPEND}
 	dev-python/attrs[${PYTHON_USEDEP}]
 	dev-python/bcrypt[${PYTHON_USEDEP}]
 	dev-python/bleach[${PYTHON_USEDEP}]
-	dev-python/canonicaljson[${PYTHON_USEDEP}]
+	<dev-python/canonicaljson-2[${PYTHON_USEDEP}]
 	dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/frozendict[${PYTHON_USEDEP}]
 	dev-python/ijson[${PYTHON_USEDEP}]
diff --git a/net-im/synapse/synapse-1.79.0.ebuild b/net-im/synapse/synapse-1.79.0.ebuild
new file mode 100644
index 000000000000..5818877e2d32
--- /dev/null
+++ b/net-im/synapse/synapse-1.79.0.ebuild
@@ -0,0 +1,203 @@
+# 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.69
+	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.46
+	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.21
+	redox_syscall-0.2.16
+	regex-1.7.1
+	regex-syntax-0.6.27
+	ryu-1.0.11
+	scopeguard-1.1.0
+	serde-1.0.152
+	serde_derive-1.0.152
+	serde_json-1.0.94
+	smallvec-1.10.0
+	subtle-2.4.1
+	syn-1.0.104
+	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/
+"
+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"
+# 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/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="
+	dev-python/setuptools-rust[${PYTHON_USEDEP}]
+	test? (
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		postgres? ( dev-db/postgresql[server] )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.78.0-frozendict-version.patch"
+)
+
+# 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
+		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 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
+		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+	fi
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_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" "${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
+		einfo "Please refer to upgrade notes if any special steps are required"
+		einfo "to upgrade from the version you currently have installed:"
+		einfo
+		einfo "  https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+		einfo
+	fi
+}