Merge branch 'master' into 'master'

Miscellanous changes, most notable bump olm and drop old olm

See merge request src_prepare/src_prepare-overlay!191

dev-cpp/pystring/pystring-1.1.3.ebuild

@@ -14,13 +14,23 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="all-rights-reserved"
+LICENSE="BSD"
 SLOT="0"
 
+BDEPEND="
+	sys-devel/gcc[cxx]
+	sys-devel/libtool
+"
+
+src_prepare() {
+	sed -i "s/\(CXXFLAGS =\) -g -O3 \(.*\)/\1 ${CXXFLAGS} \2/" Makefile || die
+	default
+}
+
 src_compile() {
 	emake LIBDIR="${S}" install
 	mkdir pystring || die
-	mv pystring.h pystring || die
+	cp pystring.h pystring || die
 }
 
 src_install() {

dev-cpp/pystring/pystring-9999.ebuild

@@ -14,13 +14,23 @@ else
 	KEYWORDS="~amd64"
 fi
 
-LICENSE="all-rights-reserved"
+LICENSE="BSD"
 SLOT="0"
 
+BDEPEND="
+	sys-devel/gcc[cxx]
+	sys-devel/libtool
+"
+
+src_prepare() {
+	sed -i "s/\(CXXFLAGS =\) -g -O3 \(.*\)/\1 ${CXXFLAGS} \2/" Makefile || die
+	default
+}
+
 src_compile() {
 	emake LIBDIR="${S}" install
 	mkdir pystring || die
-	mv pystring.h pystring || die
+	cp pystring.h pystring || die
 }
 
 src_install() {

dev-libs/olm/Manifest

@@ -1,2 +1 @@
-DIST olm-3.2.1.tar.bz2 462729 BLAKE2B 63d4c33eb79f4d0b4950ad8970d3e4a84d015193df72e4e88ad34d5d82e4c9d3c8677392ba2e12f8a80a67cff5c203b3116a0edf13798a7af3cc4fd8b6312e93 SHA512 adb9cff6148d19df4b83a287723219d4da9efd162f7a2824bee63d824d22c20a10fd2c2d8ce74aff5ec006c6dc8828bd6851cc82be93bc6c4524cf7067080412
-DIST olm-3.2.2.tar.bz2 475682 BLAKE2B f6588281ef236c36c4a678eb02250e6b0d496719dc8736b1bdcbc346a16c3b579d988d6cbe99749473e53bbc03830e90c666ced112cd5a85b63f7ebe0704b6cb SHA512 a541299f2fbdaa2be5698a690cd753142311a3206011d70186e1122d575478f91e7feba207fe5d09ce506330dd1f9fbb71dccb3de7014c5333427fdd3b77b668
+DIST olm-3.2.4.tar.bz2 479336 BLAKE2B 9de6b869c94a7f47b269b55526408ce6930ac5354495608038888f13efe72a6fab498c85c6ffe073a1f76391cbe4a83cfc6c65382d593bc487dafe64894ca0ed SHA512 94f661a2c9fe22f7dfefc89e488be37da2fe19dedd3ba296e09c55e63886ed82b71a30d84ecbdfa5dee820b1b6a918daefab248536c137459b8f244dc514920b

dev-libs/olm/olm-3.2.1.ebuild

@@ -1,62 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-DEPEND="
-	python? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/future[${PYTHON_USEDEP}]
-	)
-"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	cmake_src_prepare
-	use python && (cd python; distutils-r1_src_prepare)
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOLM_TESTS=OFF
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake_src_configure
-	use python && (cd python; distutils-r1_src_configure)
-}
-
-src_compile() {
-	cmake_src_compile
-	export LIBRARY_PATH="${S}/$(get_libdir)/" # Let python build find the already built libolm
-	use python && (cd python; distutils-r1_src_compile)
-}
-
-src_install() {
-	cmake_src_install
-	use python && (cd python; distutils-r1_src_install)
-}
-
-src_test(){
-	emake test
-}

dev-libs/olm/olm-3.2.2.ebuild

@@ -1,62 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-DEPEND="
-	python? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/future[${PYTHON_USEDEP}]
-	)
-"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	cmake_src_prepare
-	use python && (cd python; distutils-r1_src_prepare)
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DOLM_TESTS=OFF
-		-DBUILD_SHARED_LIBS=ON
-	)
-	cmake_src_configure
-	use python && (cd python; distutils-r1_src_configure)
-}
-
-src_compile() {
-	cmake_src_compile
-	export LIBRARY_PATH="${S}" # Let python build find the already built libolm
-	use python && (cd python; distutils-r1_src_compile)
-}
-
-src_install() {
-	cmake_src_install
-	use python && (cd python; distutils-r1_src_install)
-}
-
-src_test(){
-	emake test
-}

dev-python/matrix-nio/Manifest

@@ -1,2 +1,2 @@
-DIST matrix-nio-0.17.0.tar.gz 240551 BLAKE2B 245faaf8604d14962b167ceddeb2cff03089c26216e3b8e695fb9e821cbbfe1c7d468d2f9a2e0a3d7a5f522c4f5b5d98c8fb661884a8e1fc48f7e6e7a848e9fa SHA512 eee5f6f97eab81ef28d8aaaf580a8f91ed56ae13b3795f89eaf90ead7fb62b2ce7c71cc768aac01dd9baacc44b36dff00cacaf9d51ef62f009c05d3ae3f3241e
 DIST matrix-nio-0.18.1.tar.gz 240808 BLAKE2B e4048eb7271ecb0208d766987c8151ad52bf4105dd84aafd12264bdb24165684bdbd5c1740cf595953847aa1280abd2c1c13ed9d96680ec3ea445005a611130e SHA512 46974d52f02cba71df25ee38c41d7bc458b6f8a1cd089cd6e15cb3ea0cfe2e47387ef5c415f2a18a2d01dac8e4d4b378e7aad9f5162371b6f0f40172929962d4
+DIST matrix-nio-0.18.2.tar.gz 240893 BLAKE2B 5f366810828fbe06d5d7523f7c6b2d3b2cb7b20cb32577a88609491efda212acafc573dbd2d92bbb1fd4a8784d6dd2c6a82eafa90d23c5b0fdce15822c720be2 SHA512 b53cbc4cfe84340d8bf0bdecf2ea10926f0aaf3a79b3c2dd4adefd15d4ee5328154efe84782f2ed11ca5ddc57b3b3ad61e969519e6e96394c38561335a00cb06

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

@@ -1,37 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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"
-
-RDEPEND="
-	dev-python/future
-	dev-python/aiohttp
-	dev-python/aiohttp-socks
-	dev-python/aiofiles
-	dev-python/h11
-	dev-python/hyper-h2
-	dev-python/logbook
-	dev-python/jsonschema
-	dev-python/unpaddedbase64
-	dev-python/pycryptodome
-	e2e? (
-		>=dev-libs/olm-3.1.5[python(-)]
-		>=dev-python/peewee-3.9.5
-		dev-python/cachetools
-		dev-python/atomicwrites
-	)
-"

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

@@ -0,0 +1,65 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+
+RDEPEND="
+	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
+	>=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/h11-0.12.0[${PYTHON_USEDEP}]
+	>=dev-python/hyper-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[${PYTHON_USEDEP}]
+		  dev-python/atomicwrites[${PYTHON_USEDEP}]
+		  dev-python/cachetools[${PYTHON_USEDEP}]
+		  dev-python/Faker[${PYTHON_USEDEP}]
+		  dev-python/peewee[${PYTHON_USEDEP}]
+		  dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		  dev-python/pytest-flake8[${PYTHON_USEDEP}]
+		  dev-python/pytest-isort[${PYTHON_USEDEP}]
+		  dev-python/pytest-cov[${PYTHON_USEDEP}]
+		  dev-python/pytest-benchmark[${PYTHON_USEDEP}]
+		  dev-python/hpack[${PYTHON_USEDEP}]
+		  dev-python/hyperframe[${PYTHON_USEDEP}]
+		  dev-python/hypothesis[${PYTHON_USEDEP}]
+		  dev-python/mypy[${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
+}