gentoo auto-resync : 15:09:2022 - 05:12:09

3 files changed, 53 insertions, 19 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index d74dcbc83fb1..65e5586fdaaa 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/synapse/Manifest b/net-im/synapse/Manifest
index 77d717f4d7ee..c5f4ecbf65ec 100644
--- a/net-im/synapse/Manifest
+++ b/net-im/synapse/Manifest
@@ -1,11 +1,11 @@
 AUX synapse.initd 365 BLAKE2B 064dce5e10596316509f321de9819edab15fc91551e5fc9747c3a2bf28326d9db764046831689cc425ffb7bfedde9607132ebd412ad0ac0becd9d79990c0fc80 SHA512 ec87c250b9d72d3c937ec57fcd6a487c92ef341b3b46ac53fdd7b1371d71ed518c5f94e7ec63e5c859736c73b7762143e113fed9b2dfffbf070e14525b25a840
 AUX synapse.service 549 BLAKE2B 4b91a2da29b2a9afc5a6cff3c74a8b2f0dbe86063d0a47e60fddf8eb712b3642c308181ba2444a7e59b58f942368e7217dc94088a2487816aa44e28f49094573 SHA512 a9039c2883008c191cc89bec6f52893b489688e83525eeef09a979fc22b09b048cd03d6a7a450ac3d1441abccdcd6786cfd6c8f0b90ea98d1516c312bf634636
-DIST synapse-1.62.0.gh.tar.gz 7841903 BLAKE2B f3002798a3fccd1b7fc4a1a302d12dd0940727ce8e89bcab0fdda04d498dbc9e469d21e7815db75b3593fcdfa01557e6828a39e874e946ce1b43d51cfe459ee6 SHA512 2bf9264f08fab29e8707317b69c52a4234bb25443c342ba43a27e06c506bcca1a9bdb211a99802abbca551e4f4288f68775d4629493b39d58dfcc8d8d1ca8ab8
 DIST synapse-1.63.1.gh.tar.gz 7861575 BLAKE2B 7f69f2620289aa2c6b846514ce086e0ce20d559179cded20cda43b6c2ef2ad36d3b3f3fd6b139d2237a4c002c92a820a4150e5d8b25218b17bf22b9999638c67 SHA512 eb3bfb22081e932b2b7168a2b656b2ba7cc656bffbf60eb169b8d187d2a742809e2c0d6170afcea2bcf40ae5042a7b2ce7d7438294167bcc48def71e2488e338
 DIST synapse-1.65.0.gh.tar.gz 7895758 BLAKE2B 1c816dfb7982fc0462a4a3b84c19dd144e7ac16d6cadf1e73dc71002c234eed5945ad8162d69960eff1bab80a3396a1b78e0be2cc2dfee314f6fb39d0b91b098 SHA512 3ba9751f707d41a9e18d9fe63f9652c36712451d42953e2bd4add8c142418a2a47a2ce75da893832af9225b944dd7b275f6d744f6e70d468b7f143dd5ccb9137
 DIST synapse-1.66.0.gh.tar.gz 7916982 BLAKE2B 116d9f7dfd046ddc245ef1375bb3f01aad126fab8dedeb0e9172ce9b4bfa6c9757e241d9f0b2bad07525657e7a1f378d9385401436132c4ee6046629792a9840 SHA512 ebe8ab787d72592b395226490414f7dce5c250173be654dc6ce63deec3a7d718f8400cdc81dfb73ae331632bed4dfb5c6f09c64538f4bda8546db8fb75d728b7
-EBUILD synapse-1.62.0.ebuild 3011 BLAKE2B 1b696853f19885fd7b592b8dbe2d44377774c6f11484867d6b6f29f09d177d56eda6d8baef35a17b655408e23db9e7d87987418d1b26465dfa7378308085b2ae SHA512 1aef2a2e01ecaea8ceba05481131b60f8dc77f7b047676534f4ba78c78940595b2c963c3154d2bdd961c18cce3bdb5bc0e0bdaffb8551da915a50f3eec2b8294
+DIST synapse-1.67.0.gh.tar.gz 7933047 BLAKE2B 8fd6b48198256c8cbe4a2a1d5215e1eb34084065056dd251a19b01c44e7f193b612f49a8fce74498d406e338dba3c6f4a0db384f323d5e4174d181de8478ef24 SHA512 913335b3815ff218134cda80d7149a95aea69eda170e9da6d7566213f077692a92b0276e2530ae4e69572b13124de28b6546a7322b3d9e65f676df0ca4cb9469
 EBUILD synapse-1.63.1.ebuild 3196 BLAKE2B 65b0143d80ec390dfe54e9e8750b7b1816bd762cb2449b4bb3c7a36078e007528fc2a8deaeb608dfe86e6126862e137d713c99d9e8976c8f7e7875db004035aa SHA512 00d922ffed7320471bcdf0d4f8bcc2534b2423dbb10a1548988a7eb6ac76f16de71943a311174eff5c4e5d403b09dd97889f579c5d9563728c54f83f3c4b9eb5
 EBUILD synapse-1.65.0.ebuild 3234 BLAKE2B d2a4de34c5291e116e33b6fbd8ecb97a0f47947ed6f4f87dd5ec08791cb380472eb49066996807ccb8e4080f8e4e95decd9f7d34302faff2fa9e8612bdb5d9f2 SHA512 bd0019a34753bde068db4d31457204dd59364966c0a763567afff6f9048416cd9917c808ab640f6a34f33a9a385d289587544b947d16d181fab85da1bc6983f0
 EBUILD synapse-1.66.0.ebuild 3668 BLAKE2B 16134727577a85e574eb2c8ca4a9142a4944b9a0c02c898b2f30c7da7c48606262a8b53f9fe8bde70f19367291efd256d62f05fb49184be6541e91e885559968 SHA512 64198aa11be8789a468da208684936c1254e181883159edf77814848d3cc11e28b4c14d1c77fb6a8015ac161fbb4d46eac099cbf091f47318eae10ef5587dff9
+EBUILD synapse-1.67.0.ebuild 4022 BLAKE2B 69e29b7cff22b4aeaae18cd205688b825ee1c085ac9544d200f5c3a77e0d44b2ce591d54da57951e7437fe62652741229ccc49d16c0520d29f163709f69ad3a6 SHA512 8717c345befa7911b9a7b6ce2b0a3b3a34c3685c3326affe70f98793f31b593d97cc04535cb779ea5ba34f871918d288d12f7a66fdb3d8943d1495eb25a9963f
 MISC metadata.xml 474 BLAKE2B 1e990bd0b3e6234f15e2e036ca6c9157b6bb27c36542e24d5e80a5f2a8dc04a592ee267869869d79bee00177ac8c11ddb630483d802c3d6be49317d41ea41cdb SHA512 6447082bda7509c395fc60bd23fb506d1d61cc0d6b89aca7d68c263270bb7d941f3ea95b18f428c301b0f0cd536688856b85ea264b0facea7cb5d51bd5909c46
diff --git a/net-im/synapse/synapse-1.62.0.ebuild b/net-im/synapse/synapse-1.67.0.ebuild
index 737cfe893c82..17b22a83c544 100644
--- a/net-im/synapse/synapse-1.62.0.ebuild
+++ b/net-im/synapse/synapse-1.67.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{9..10} )
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=poetry
 
-inherit distutils-r1 optfeature
+inherit distutils-r1 multiprocessing optfeature systemd
 
 DESCRIPTION="Reference implementation of Matrix homeserver"
 HOMEPAGE="
@@ -27,7 +27,7 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="test"
+IUSE="postgres systemd test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -54,6 +54,7 @@ RDEPEND="${DEPEND}
 		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}]
@@ -64,17 +65,41 @@ RDEPEND="${DEPEND}
 		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="
-	test? ( $(python_gen_cond_dep '
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	') )
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/idna[${PYTHON_USEDEP}]
+			dev-python/parameterized[${PYTHON_USEDEP}]
+		')
+		postgres? ( dev-db/postgresql[server] )
+	)
 "
 
+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
+
+	distutils-r1_src_test
+
+	if use postgres; then
+		pg_ctl --wait --pgdata="${T}/pgsql" stop || die
+	fi
+}
+
 python_test() {
-	"${EPYTHON}" -m twisted.trial tests || die "Tests failed with ${EPYTHON}"
+	"${EPYTHON}" -m twisted.trial -j "$(makeopts_jobs)" tests || die "Tests failed with ${EPYTHON}"
 }
 
 python_install() {
@@ -83,19 +108,28 @@ python_install() {
 	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 "VoIP relaying on your homeserver with turn" net-im/coturn
 
-	einfo "In order to generate initial configuration run:"
-	einfo "sudo -u synapse synapse_homeserver \\"
-	einfo "    --server-name matrix.domain.tld \\"
-	einfo "    --config-path /etc/synapse/homeserver.yaml \\"
-	einfo "    --generate-config \\"
-	einfo "    --data-directory /var/lib/synapse \\"
-	einfo "    --report-stats=no"
-	einfo
-	einfo "See also upgrade notes:"
-	einfo "https://github.com/matrix-org/synapse/blob/develop/docs/upgrade.md"
+	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
 }