Merge branch 'master' into 'master'

Fix major oversights with matrix-nio

See merge request src_prepare/src_prepare-overlay!180

dev-python/m2r2/Manifest

@@ -0,0 +1 @@
+DIST m2r2-0.2.7.tar.gz 28653 BLAKE2B 374b4db98158b24aca57cef1e75d37af2623e305b45e4a1f84c6126e48116311fd6e5159854605e027a568d668dc04b9408a64c614e1609f6ed32e2e4722df49 SHA512 6b93ca7b564094e2a1e8ae538e00aa1f361dd40496bef1e440bfe152c905c35c6aad5fb9429ef51b5e6b532c73bcce03c1d17ac1f654e4973de885d1fe33bb9b

dev-python/m2r2/files/quick_workaround_to_distributionnotfound.patch

@@ -0,0 +1,20 @@
+diff --git a/setup.py b/setup.py
+index f80b653..4a604bb 100644
+--- a/setup.py
++++ b/setup.py
+@@ -10,13 +10,9 @@ except ImportError:
+     from distutils.core import setup
+ 
+ readme_file = path.join(path.dirname(path.abspath(__file__)), "README.md")
+-try:
+-    from m2r2 import parse_from_file
+ 
+-    readme = parse_from_file(readme_file)
+-except ImportError:
+-    with open(readme_file) as f:
+-        readme = f.read()
++with open(readme_file) as f:
++    readme = f.read()
+ 
+ 
+ __version__ = "0.2.7"

dev-python/m2r2/m2r2-0.2.7.ebuild

@@ -0,0 +1,33 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9})
+
+inherit distutils-r1
+
+DESCRIPTION="Markdown to reStructuredText converter "
+HOMEPAGE="https://crossnox.github.io/m2r2/"
+SRC_URI="https://github.com/CrossNox/m2r2/archive/refs/tags/v"${PV}".tar.gz -> "${P}".tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/mistune[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		  ${RDEPEND}
+		  dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+PATCHES=( "${FILESDIR}/quick_workaround_to_distributionnotfound.patch" )

dev-python/m2r2/metadata.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">CrossNox/m2r2</remote-id>
+  </upstream>
+</pkgmetadata>

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

@@ -15,7 +15,7 @@ SRC_URI="https://github.com/poljar/matrix-nio/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="doc e2e test"
+IUSE="e2e test"
 
 RDEPEND="
 	>=dev-python/future-0.18.2[${PYTHON_USEDEP}]
@@ -55,21 +55,11 @@ DEPEND="
 		  dev-python/mypy_extensions[${PYTHON_USEDEP}]
 	)
 "
-BDEPEND="
-	doc? ( dev-python/sphinx )
-"
 
 distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/m2r2
 
-# Tests dont parallelize happily
-
-python_compile_all() {
-	if use doc; then
-		emacs -C docs html || die
-	fi
-}
-
-python_install_all() {
-	use doc && HTML_DOCS=( docs/build/html/. )
-	distutils-r1_python_install_all
+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
 }

dev-python/matrix-nio/metadata.xml

@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email> parona@protonmail.com </email>
-		<name> Alfred Wingate </name>
-	</maintainer>
-	<use>
-		<flag name="e2e"> Enable end to end encryption support </flag>
-	</use>
+  <maintainer type="person">
+    <email>parona@protonmail.com</email>
+    <name>Alfred Wingate</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">poljar/matrix-nio</remote-id>
+  </upstream>
+  <use>
+    <flag name="e2e">Enable end to end encryption support</flag>
+  </use>
 </pkgmetadata>