4 files changed, 2 insertions, 120 deletions
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 35deb98b229a..fb2a3eeec0ff 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,7 +1,4 @@
-AUX sybil-2.0.1-py310.patch 3513 BLAKE2B 5004b889f186591a31e990b7bc88eec5063b67e2d43103e73c6a4c411b96d804762421cd24440a4caa2622abaf04c6b4e1e5417e2e1644339fedbf9c6aab7292 SHA512 450b21492c70dc8838b9eeb515d9dfbd36e857da6c641598e3a95e6499431476b5c864f466653e36015236b5c13c2056cd324adbe44d9a52bd9d8fc17260708a
 AUX sybil-3.0.0-test-order.patch 1864 BLAKE2B 8b84a7148a51c5f7ac6f2c0a2c296ae6833c80dd27f5a3d260aa40c7ed88f5a90480b8961266620d91fd67acffe462fa63d206df2e9f0bd35b50912f9d9716c4 SHA512 f2b11a7a7f53a8ead589efdb89e84fa1508833d5ab248e23da386f96bc949ad17e3c45aea7afbc5bfbe0148f5ad368ccafef37dcef0d2ba6877cdb112b6f8bb0
-DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
 DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d
-EBUILD sybil-2.0.1.ebuild 475 BLAKE2B e1c7d174ede80ea3907674b271d8ee38af02ca9a2d5724957aac1b95d70afd7b0b36c1fa8689643d846df141b9be9accf6f84785df227a3a15c6e72e681e0f65 SHA512 8ce03f90558d6ee63fff2d7e2b3707c5cc674077853b54b4585ca5b8b1747b197e32a48b6c3bb5c20e7a3014417ecdc3428bcbb0ea0c14a0b54cb77831a8f06a
-EBUILD sybil-3.0.0.ebuild 486 BLAKE2B 986201ae61508baa13d0a37af0c53c1e9953c7e13c0f065923d9722938cb0e928a7176a3e3a64cbe133a37e0eff512551712174dd61158d80ef90d3eb4740ee0 SHA512 82435774dfb4c2728066e012f972dc37d40a666d78f595a12711cdc939b325a94bb044a81eb9f03fc33cf584466b12295b4e5dd779492b7dfeed8db1b69383ad
+EBUILD sybil-3.0.0.ebuild 483 BLAKE2B 25e7d4f64ffc583bb8dbedaba6e4b4623586bd91c479dad9c848f1805739f4edb3016437f16a5e34093c427fe88b0fd98e1d30ac9006e4b48540bafb91bae616 SHA512 2399e1fbd9dfeaeebefb21afba3f3f4e50cf04661771342c6ab9776efff2d0cd3f07d3471925d002ebb65507528969f92321e0a5f486ef71a7ca8205430dbbf6
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/files/sybil-2.0.1-py310.patch b/dev-python/sybil/files/sybil-2.0.1-py310.patch
deleted file mode 100644
index 15d46bae929b..000000000000
--- a/dev-python/sybil/files/sybil-2.0.1-py310.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 022fe7d654bdeba6db6eb26c0f9434f0882174bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 9 Jun 2021 10:49:33 +0200
-Subject: [PATCH 1/3] tests: adjust for slightly different whitespace under
- python3.10
-
-'>   raise' is now '>    raise' (extra space).
-
-For https://bugzilla.redhat.com/show_bug.cgi?id=1908278.
-The tests now pass with python3-3.9.5-2.fc34.x86_64 and
-python3-3.10.0~b2-3.fc35.x86_64.
----
- tests/test_functional.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_functional.py b/tests/test_functional.py
-index f8d41de..5a2e356 100644
---- a/tests/test_functional.py
-+++ b/tests/test_functional.py
-@@ -99,14 +99,14 @@ def pytest_sessionfinish(self, session):
-                   'sybil teardown 4\n'
-                   'session_fixture teardown')
-     out.then_find('_ fail.rst line=1 column=1 _')
--    out.then_find(  ">   raise Exception('the start!')")
-+    out.then_find(  "   raise Exception('the start!')")
-     out.then_find('_ fail.rst line=8 column=1 _')
-     out.then_find('Y count was 3 instead of 2')
-     out.then_find('fail.rst:8: SybilFailure')
-     out.then_find('_ fail.rst line=10 column=1 _')
-     out.then_find('ValueError: X count was 3 instead of 4')
-     out.then_find('_ fail.rst line=14 column=1 _')
--    out.then_find(">       raise Exception('boom!')")
-+    out.then_find("       raise Exception('boom!')")
-     out.then_find('fail.rst:18: Exception')
- 
- 
-
-From 9723fc90f0b1f8f48c1109d501a31309f93add92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 9 Jun 2021 10:50:06 +0200
-Subject: [PATCH 2/3] tests: adjust for different line numbers under python3.10
-
-I think this is related to
-https://docs.python.org/3.10/whatsnew/3.10.html#pep-626-precise-line-numbers-for-debugging-and-other-tools
-
-For https://bugzilla.redhat.com/show_bug.cgi?id=1908278.
-The tests now pass with python3-3.9.5-2.fc34.x86_64 and
-python3-3.10.0~b2-3.fc35.x86_64.
----
- tests/test_codeblock.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_codeblock.py b/tests/test_codeblock.py
-index c9f8b17..c30ae3a 100644
---- a/tests/test_codeblock.py
-+++ b/tests/test_codeblock.py
-@@ -44,7 +44,7 @@ def test_future_imports():
-     )
-     # the future import line drops the firstlineno by 1
-     code = compile_codeblock(regions[0].parsed, document.path)
--    assert code.co_firstlineno == 2
-+    assert code.co_firstlineno in (1, 2)  # we get 1 under python3.10
-     assert evaluate_region(regions[1], namespace) is None
-     assert buffer.getvalue() == (
-         'pathalogical worst case for line numbers\n'
-@@ -52,7 +52,7 @@ def test_future_imports():
-     )
-     # the future import line drops the firstlineno by 1
-     code = compile_codeblock(regions[1].parsed, document.path)
--    assert code.co_firstlineno == 8
-+    assert code.co_firstlineno in (1, 8)  # we get 1 under python3.10
- 
- 
- def test_windows_line_endings(tmp_path):
-
-From 11862367a760045cc34c11cf888b04f9ca6f4e2d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Wed, 9 Jun 2021 10:51:56 +0200
-Subject: [PATCH 3/3] gitignore: ignore __pycache__ directories
-
----
- .gitignore | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/.gitignore b/.gitignore
-index ee824be..0afa48a 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -5,4 +5,5 @@
- .coverage*
- _build/
- .*cache/
-+__pycache__/
- pytestdebug.log
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
deleted file mode 100644
index 84763f93566f..000000000000
--- a/dev-python/sybil/sybil-2.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/cjw296/sybil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${P}-py310.patch
-)
diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
index 5ac40aac71ef..0b0c9f2b1cfe 100644
--- a/dev-python/sybil/sybil-3.0.0.ebuild
+++ b/dev-python/sybil/sybil-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 distutils_enable_tests pytest