gentoo resync : 25.11.2020

4 files changed, 13 insertions, 63 deletions

diff --git a/dev-python/libtmux/Manifest b/dev-python/libtmux/Manifest
index 2bc15847a9dd..9acc4151b32e 100644
--- a/dev-python/libtmux/Manifest
+++ b/dev-python/libtmux/Manifest
@@ -1,6 +1,5 @@
-AUX libtmux-0.8.2-tests.patch 1677 BLAKE2B e5d3e6717809c36411ab3b5991dc1dec7a38868015529fe867743c31eacd81de13d74e96f3232106d43b68abad7e1b94afdecab44cc2954135ef34afce484a33 SHA512 b5df69fcda982fb7d8b0bc0659994959a5d4d868e46cfda43e8e9d3abb14a1a094c63da25a73250bc8329a93cf9a5747fe4cee51580b3802a4be1dfc8a68d33b
-DIST libtmux-v0.8.2.tar.gz 117077 BLAKE2B 52e9c7c47911797e9d2446e7fbc836f9482912e255c05d9b329d4a33f5f03d0bfad4df492902eff5605180f90efcd81a7e432174646cb2051b0f9dfa6615a91a SHA512 e5f3768f4ddd746c5380a92899961be05b1b6c567d9333720b0fd9ed124131671bbecf1c04a7c4e658092424b6dc89dd656ba559385b0a6f673f9895dd6c829c
 DIST libtmux-v0.8.3.tar.gz 131928 BLAKE2B 7979dc907d5c7805cf56422aa0fed554c89f0b50cf1f13b150809a1c7e24b0eab125701eada0431212afccc26f6479642c886b3f701c8c2ffc9c3ebb7d08c4cc SHA512 f7c5a84f16b400db672318d3c0b79cd8f328a0096d32349f6ce9360d72eecd75ed9915af5c37950adadd81943130b543716d718366522efee7780813a2c1a5d6
-EBUILD libtmux-0.8.2-r2.ebuild 958 BLAKE2B 8832e5e5bbe54cc5cdde6e74db5e99e23e75743f6a521c08aa079a9498be3cca2a9d6763bfa32b41e35247b8d673a4a663010d029222b9a50db40414e329cc75 SHA512 dde383d5a9be09daed79a2341ab7f392c86293c7dd7ec1150dc4eb7ffd6202db9baba94dab3372263317404b1560358bbf0f912dee5b42b7736f9c72be8ae3f1
-EBUILD libtmux-0.8.3.ebuild 906 BLAKE2B 7e7b3f4dc9d4097731f0613bc5fc723d89f533d6c7394acaa6980b4e2e2e599023cf7c4d5fd93c964793734bdc0f27a856e089a7a5310686741612b83c44d854 SHA512 5e093343c1453618f784136356e30488c0b1e05c89fb6c2d4b4f182ee33aaf1a2246b334c4c5d8f25043357424a8d6d9ceefe02d301b006eed752c33d49fec38
+DIST libtmux-v0.8.5.tar.gz 222445 BLAKE2B 5af148555eb89c66bdc66f3f214967f7e901d9b86ea85e02a9fba64f2eb3559828519ba8120eaee5eb86ec75bee2e599a08384dd096de8dc0969129c58172c1e SHA512 d456725c3ca41a672ee5239bfb5f42a262674638d308fa141627995be8b8fe348bb8713b735eb05c5a3cc73f35fe3f6fac12024f6254c950a3048b2e07606363
+EBUILD libtmux-0.8.3.ebuild 904 BLAKE2B 8bfe4291e9a5f72b367ac75810efb7558d4f5daef054a702da55597f0e5f0a08962d9cbb281779770c30f061a52bd03a7d77073aedd51e67624b4b0d166d6b11 SHA512 bb462d811dc4af3658e37f109f88790d2e0dc2fbde1d5b6e4414b783ac10a5a85b62f5585cd6225bf639eebdf2a664a4f505b902360e68b3d670b26c53545106
+EBUILD libtmux-0.8.5.ebuild 899 BLAKE2B 3aa62cc70d968e171b733c71ae82309c9977001f068da947639a164f10fb5f2ba733d502b77fe3c12b386071da39e25596395e63377d524e1fc1f5bd6b0cafe0 SHA512 547279cfe76093d7a729541189319bbbe80e74663c3effafb753fa4ef954496e84b9cf7d69305f7dcc9ddd741b74ef319ac06e0e667a3ce090e3b6d754fbd5cb
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/libtmux/files/libtmux-0.8.2-tests.patch b/dev-python/libtmux/files/libtmux-0.8.2-tests.patch
deleted file mode 100644
index c402af58ea01..000000000000
--- a/dev-python/libtmux/files/libtmux-0.8.2-tests.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/tests/test_session.py b/tests/test_session.py
-index 79c9861..d83b095 100644
---- a/tests/test_session.py
-+++ b/tests/test_session.py
-@@ -131,8 +131,8 @@ def test_empty_session_option_returns_None(session):
- 
- 
- def test_show_option_unknown(session):
--    """Session.show_option raises UnknownOption for invalid option."""
--    with pytest.raises(exc.UnknownOption):
-+    """Session.show_option raises InvalidOption for invalid option."""
-+    with pytest.raises(exc.InvalidOption):
-         session.show_option('moooz')
- 
- 
-@@ -149,12 +149,12 @@ def test_set_option_ambigous(session):
- 
- 
- def test_set_option_invalid(session):
--    """Session.set_option raises UnknownOption for invalid option."""
-+    """Session.set_option raises InvalidOption for invalid option."""
-     if has_gte_version('2.4'):
-         with pytest.raises(exc.InvalidOption):
-             session.set_option('afewewfew', 43)
-     else:
--        with pytest.raises(exc.UnknownOption):
-+        with pytest.raises(exc.InvalidOption):
-             session.set_option('afewewfew', 43)
- 
- 
-diff --git a/tests/test_window.py b/tests/test_window.py
-index 5d0a674..896fadf 100644
---- a/tests/test_window.py
-+++ b/tests/test_window.py
-@@ -210,10 +210,10 @@ def test_show_window_option(session):
- 
- 
- def test_show_window_option_unknown(session):
--    """Window.show_window_option raises UnknownOption for bad option key."""
-+    """Window.show_window_option raises InvalidOption for bad option key."""
-     window = session.new_window(window_name='test_window')
- 
--    with pytest.raises(exc.UnknownOption):
-+    with pytest.raises(exc.InvalidOption):
-         window.show_window_option('moooz')
- 
- 
diff --git a/dev-python/libtmux/libtmux-0.8.3.ebuild b/dev-python/libtmux/libtmux-0.8.3.ebuild
index 628783d9c6c8..440db1626d79 100644
--- a/dev-python/libtmux/libtmux-0.8.3.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND=">=app-misc/tmux-3.0a"
 
diff --git a/dev-python/libtmux/libtmux-0.8.2-r2.ebuild b/dev-python/libtmux/libtmux-0.8.5.ebuild
index 63bc25a2154a..10eaf095c176 100644
--- a/dev-python/libtmux/libtmux-0.8.2-r2.ebuild
+++ b/dev-python/libtmux/libtmux-0.8.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 inherit distutils-r1
 
@@ -13,23 +13,21 @@ SRC_URI="https://github.com/tmux-python/${PN}/archive/v${PV}.tar.gz -> ${PN}-v${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 
 RDEPEND=">=app-misc/tmux-3.0a"
-
-PATCHES=(
-	"${FILESDIR}/libtmux-0.8.2-tests.patch"
-)
+BDEPEND="
+	test? (
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
 
 distutils_enable_tests pytest
-distutils_enable_sphinx doc \
-	dev-python/alagitpull \
-	dev-python/docutils
 
 python_prepare_all() {
-	# avoid a dependency on sphinx_issues
 	local issues="https://github.com/tmux-python/libtmux/issues/"
-	sed -i "s:'sphinx_issues',::" doc/conf.py || die
 	sed -r -i "s|:issue:\`([[:digit:]]+)\`|\`issue \1 ${issues}\1\`|" CHANGES || die
 	rm requirements/doc.txt || die