Merge branch 'matrix-nio' into 'master'

bump olm and matrix-nio

See merge request src_prepare/src_prepare-overlay!242

dev-libs/olm/Manifest

@@ -1 +1,2 @@
 DIST olm-3.2.4.tar.bz2 479336 BLAKE2B 9de6b869c94a7f47b269b55526408ce6930ac5354495608038888f13efe72a6fab498c85c6ffe073a1f76391cbe4a83cfc6c65382d593bc487dafe64894ca0ed SHA512 94f661a2c9fe22f7dfefc89e488be37da2fe19dedd3ba296e09c55e63886ed82b71a30d84ecbdfa5dee820b1b6a918daefab248536c137459b8f244dc514920b
+DIST olm-3.2.6.tar.bz2 485416 BLAKE2B 414e636a1bd32ff7698f3db7748a77aaa2449d260c79f3dcb64db6c509e4f972e4098e439838eb876bc7b738d25a5c704fed94edc9ca41f2c036c3d1438934f0 SHA512 e22af4e7791962978ea4c39b9bebf807a864ca52b329f032e5e398864cd142c1f166aadbce74cb85f776cb0b8352754151f64c60dac2ce1858def73d684fd44a

dev-libs/olm/olm-3.2.4.ebuild

@@ -29,11 +29,11 @@ DEPEND="
 		>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]
 		dev-python/future[${PYTHON_USEDEP}]
 		test? (
-			  dev-python/aspectlib[${PYTHON_USEDEP}]
+			dev-python/aspectlib[${PYTHON_USEDEP}]
-			  dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+			dev-python/pytest-benchmark[${PYTHON_USEDEP}]
-			  dev-python/pytest-cov[${PYTHON_USEDEP}]
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
-			  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+			dev-python/pytest-flake8[${PYTHON_USEDEP}]
-			  dev-python/pytest-isort[${PYTHON_USEDEP}]
+			dev-python/pytest-isort[${PYTHON_USEDEP}]
 		)
 	)
 "
@@ -90,7 +90,7 @@ src_test() {
 	emake test
 	if use python; then
 		pushd python || die
-		distutils-r1_src_test
+		LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" distutils-r1_src_test
 		popd || die
 	fi
 }

dev-libs/olm/olm-3.2.6.ebuild

@@ -0,0 +1,96 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit cmake distutils-r1
+
+DESCRIPTION="An implementation of the Double Ratchet cryptographic ratchet in C++"
+HOMEPAGE="https://git.matrix.org/git/olm/about/"
+
+if [[ "${PV}" == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.matrix.org/matrix-org/${PN}.git"
+else
+	SRC_URI="https://gitlab.matrix.org/matrix-org/${PN}/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1)"
+IUSE="python test"
+REQUIRED_USE="doc? ( python )"
+
+DEPEND="
+	python? (
+		>=dev-python/cffi-1.0.0[${PYTHON_USEDEP}]
+		dev-python/future[${PYTHON_USEDEP}]
+		test? (
+			dev-python/aspectlib[${PYTHON_USEDEP}]
+			dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+			dev-python/pytest-cov[${PYTHON_USEDEP}]
+			dev-python/pytest-flake8[${PYTHON_USEDEP}]
+			dev-python/pytest-isort[${PYTHON_USEDEP}]
+		)
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx "${S}"/python/docs
+
+DOCS=( "${S}/docs/" )
+
+src_prepare() {
+	cmake_src_prepare
+	if use python; then
+		pushd python || die
+		distutils-r1_src_prepare
+		popd || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DOLM_TESTS=$(usex test ON OFF)
+	)
+	cmake_src_configure
+	if use python; then
+		pushd python || die
+		distutils-r1_src_configure
+		popd || die
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+	if use python; then
+		pushd python || die
+		# Let python build find the already built libolm
+		export LIBRARY_PATH="${BUILD_DIR}/"
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_install() {
+	cmake_src_install
+	if use python; then
+		pushd python || die
+		distutils-r1_src_install
+		popd || die
+	fi
+	einstalldocs
+}
+
+src_test() {
+	emake test
+	if use python; then
+		pushd python || die
+		LD_LIBRARY_PATH="${BUILD_DIR}:${LD_LIBRARY_PATH}" distutils-r1_src_test
+		popd || die
+	fi
+}

dev-python/matrix-nio/Manifest

@@ -1,3 +1,4 @@
 DIST matrix-nio-0.18.2.tar.gz 240893 BLAKE2B 5f366810828fbe06d5d7523f7c6b2d3b2cb7b20cb32577a88609491efda212acafc573dbd2d92bbb1fd4a8784d6dd2c6a82eafa90d23c5b0fdce15822c720be2 SHA512 b53cbc4cfe84340d8bf0bdecf2ea10926f0aaf3a79b3c2dd4adefd15d4ee5328154efe84782f2ed11ca5ddc57b3b3ad61e969519e6e96394c38561335a00cb06
 DIST matrix-nio-0.18.3.tar.gz 240965 BLAKE2B 59dc7b7df7ca7ac21b48c1694a730c149d6a0a04e1bc68b3e75fa9278657e44e09eb2fea3a7eb1f56b7bb1c8e7231d649f6908f05ff05acd0566b01d30d8031a SHA512 ca99d4962fbc2f6d82e5b6ea53fcd82d0ed5a3a1c8a21a7ff211bf8892d2b60f72944ae19a41b102cd6473e04eedb614488f2fa2a2fd130ad70078aea2ba9518
 DIST matrix-nio-0.18.5.tar.gz 241127 BLAKE2B 1b0816b6eb6f0c68e5ecfb10cb48ef43cebd6c16e7076a94bd4f1c104e71a86caca5774c483c942bbf5ea1142c57f7b661fd3030cf238c1ef5d009472f7096de SHA512 c325871abd6c9fad410d7c9938a44e15c62b18c2c00aa0b5e16a769636d23c64dd133fac9bc597db759b647f2cdba3b9eebf52b79c5327831d0fd99d43a1ff2a
+DIST matrix-nio-0.18.7.tar.gz 241474 BLAKE2B 515ca0643e7cba3b649a8f7d2df0d5596ac936b260975ba42552e80453fbf4220a1d028bd2f4a8bf6b11782d6124fb90bfe541c0535c14e6cbe77ca3c02d0c68 SHA512 8b63d35c6c2916677a8fec89a56bd8788aadf892cb5d7f2d1b74734130bdc9e94f35caff145bbba60cf8abf915ec4b3e65d488876ddfa43c3cf5f0c284b5f4bd

dev-python/matrix-nio/matrix-nio-0.18.7.ebuild

@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9})
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Matrix client library, designed according to sans I/O principles"
+HOMEPAGE="https://github.com/poljar/matrix-nio"
+SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="e2e test"
+
+RESTRICT="!e2e? ( test )"
+
+# 28.11.2021: 3.10 blocked by logbook, olm, pytest-{benchmark,isort}
+RDEPEND="
+	>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/aiohttp-socks-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/aiofiles-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
+	>=dev-python/h11-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/h2-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/logbook-1.5.3[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unpaddedbase64-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.10.1[${PYTHON_USEDEP}]
+	e2e? (
+		>=dev-libs/olm-3.1.3[python(-),${PYTHON_USEDEP}]
+		>=dev-python/peewee-3.14.4[${PYTHON_USEDEP}]
+		>=dev-python/cachetools-4.2.1[${PYTHON_USEDEP}]
+		>=dev-python/atomicwrites-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/aioresponses-0.7.2[${PYTHON_USEDEP}]
+		dev-python/atomicwrites[${PYTHON_USEDEP}]
+		dev-python/cachetools[${PYTHON_USEDEP}]
+		>=dev-python/Faker-8.0.0[${PYTHON_USEDEP}]
+		dev-python/peewee[${PYTHON_USEDEP}]
+		>=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-benchmark-3.2.3[${PYTHON_USEDEP}]
+		dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		>=dev-python/pytest-isort-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-cov-2.11.1[${PYTHON_USEDEP}]
+		>=dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hyperframe-6.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-6.8.9[${PYTHON_USEDEP}]
+		>=dev-python/mypy-0.812[${PYTHON_USEDEP}]
+		dev-python/mypy_extensions[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/m2r2
+
+python_test() {
+	# Former requires internet access, latter fails randomly
+	epytest --deselect tests/async_client_test.py::TestClass::test_connect_wrapper[pyloop] --deselect tests/async_client_test.py::TestClass::test_transfer_monitor_callbacks
+}