gentoo resync : 06.04.2022

4 files changed, 2 insertions, 71 deletions

diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index a2667ddf6444..609c645e7eaa 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,6 +1,3 @@
-AUX sybil-3.0.0-test-order.patch 1864 BLAKE2B 8b84a7148a51c5f7ac6f2c0a2c296ae6833c80dd27f5a3d260aa40c7ed88f5a90480b8961266620d91fd67acffe462fa63d206df2e9f0bd35b50912f9d9716c4 SHA512 f2b11a7a7f53a8ead589efdb89e84fa1508833d5ab248e23da386f96bc949ad17e3c45aea7afbc5bfbe0148f5ad368ccafef37dcef0d2ba6877cdb112b6f8bb0
-DIST sybil-3.0.0.tar.gz 38011 BLAKE2B 7a42d5b0f3f13ac111d9edc9f74cb4d968f49680bb33d267ee762e830b134fa8c2e1697834d6a6a7aa09c9cd1dc52552379ca43e6667ee844f54f34b8bd3ffc7 SHA512 b6f5b5ebdeeab2ecbe17b6f83f0bc7e83e68f8e784b6a0eea292020db42294f8a1d0288d208f8a5803d5866038c3226f0b7d0d177c91469c4651364078d1bb4d
 DIST sybil-3.0.1.tar.gz 38265 BLAKE2B 3a9dd8d85a5a6228944f104d255826b4dfee80f5a349da3a0fa69edcfa0953145378f002c1bf834e21c0d382fc96a993b927bdc92bb3e9a84d34998ad6ade62f SHA512 312c57f0de646b1e7a3b992806362c1020b2d567c805d248e94ab22a336a8fc77704234e123e1ec74987bfea620b2f8c4d3714d32aee03587c615d3d90fe5558
-EBUILD sybil-3.0.0.ebuild 483 BLAKE2B 25e7d4f64ffc583bb8dbedaba6e4b4623586bd91c479dad9c848f1805739f4edb3016437f16a5e34093c427fe88b0fd98e1d30ac9006e4b48540bafb91bae616 SHA512 2399e1fbd9dfeaeebefb21afba3f3f4e50cf04661771342c6ab9776efff2d0cd3f07d3471925d002ebb65507528969f92321e0a5f486ef71a7ca8205430dbbf6
-EBUILD sybil-3.0.1.ebuild 469 BLAKE2B f7b62253ba979cef9b9fef5745156ba2b1b72c10442b5d506ab80b46a656616a5f3f584e7d474fcf78c4054af89bd73c451271abea8fa9d1aebfed5296540a35 SHA512 a6dd01c8beb01ced8abba4195a8e05d9e0a5511b3b65c1134da2bd1fa032556264e7ca9e2535b5f03d615aa7d1c9afb418cc6a1f2b0536efa92d82e339f6d69b
+EBUILD sybil-3.0.1.ebuild 466 BLAKE2B df5ab70c7279e7661e351c045c7210f81a9db8f2acdd5f29906503ae30af5e6e2f0165c5e7baf90b984cd047861c099f97f006e16cc9beca9987f8bcd0111e24 SHA512 09d5cbc6dd13b18e35bdfe5fd611e72627d1126061f12560ca7991a952da7ec8c2e9aed30787274b25ad119723299e7f840a08843f95f2733e095100be37bf8e
 MISC metadata.xml 402 BLAKE2B 3fcce3ac9ff731e24a3f6e761da2d840b3a7c9107b3d9a46afe00fed61b475d1400580b4ccf49dd71f6a1ab8098dc2aaf895e529a723cd96301d1400ee211edf SHA512 138106c714dc33871ccf535cc47d669580b665c842adfea5442a03067fe507236d8fde4158f006e1188003abe53c9c25db98632dadd1cfa0e41efd1755c2c75c
diff --git a/dev-python/sybil/files/sybil-3.0.0-test-order.patch b/dev-python/sybil/files/sybil-3.0.0-test-order.patch
deleted file mode 100644
index 1badf5b06a19..000000000000
--- a/dev-python/sybil/files/sybil-3.0.0-test-order.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4d1e1c891bd619a0dec0a265a930bf49050833d1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 Oct 2021 13:07:01 +0200
-Subject: [PATCH] Restore sorting of test paths to make tests reliable again
-
-11496eb5761761b687ad4889b4173d3124caa844 has replaced the all_documents
-method with a direct call to glob.  This has implicitly resulted
-in removal of path sorting that in turn means that the test output
-depends on filesystem order now and is no longer reliable.
-In particular, the tests can now fail randomly depending
-on the underlying filesystem, unpack/checkout order, etc.  Restore
-explicit sorting to make test order predictable again.
-
-Fixes #34
----
- sybil/integration/unittest.py | 2 +-
- tests/test_sybil.py           | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sybil/integration/unittest.py b/sybil/integration/unittest.py
-index 7129ddf..ce34caf 100644
---- a/sybil/integration/unittest.py
-+++ b/sybil/integration/unittest.py
-@@ -38,7 +38,7 @@ def unittest_integration(sybil: 'Sybil'):
- 
-     def load_tests(loader=None, tests=None, pattern=None):
-         suite = TestSuite()
--        for path in sybil.path.glob('**/*'):
-+        for path in sorted(sybil.path.glob('**/*')):
-             if path.is_file() and sybil.should_parse(path):
-                 document = sybil.parse(path)
- 
-diff --git a/tests/test_sybil.py b/tests/test_sybil.py
-index 74a04ea..72a5aea 100644
---- a/tests/test_sybil.py
-+++ b/tests/test_sybil.py
-@@ -243,7 +243,7 @@ def parse(document):
- 
- def test_namespace(capsys):
-     sybil = Sybil([parse], path='./samples')
--    documents = [sybil.parse(p) for p in sybil.path.glob('sample*.txt')]
-+    documents = [sybil.parse(p) for p in sorted(sybil.path.glob('sample*.txt'))]
-     actual = []
-     for document in documents:
-         for example in document:
diff --git a/dev-python/sybil/sybil-3.0.0.ebuild b/dev-python/sybil/sybil-3.0.0.ebuild
deleted file mode 100644
index 0b0c9f2b1cfe..000000000000
--- a/dev-python/sybil/sybil-3.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1
-
-DESCRIPTION="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/simplistix/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}-test-order.patch
-)
diff --git a/dev-python/sybil/sybil-3.0.1.ebuild b/dev-python/sybil/sybil-3.0.1.ebuild
index 15c8b5282f0d..1254f47d97fb 100644
--- a/dev-python/sybil/sybil-3.0.1.ebuild
+++ b/dev-python/sybil/sybil-3.0.1.ebuild
@@ -14,6 +14,6 @@ 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