gentoo resync : 20.10.2021

4 files changed, 0 insertions, 95 deletions

diff --git a/dev-python/xdoctest/Manifest b/dev-python/xdoctest/Manifest
index 11055c43d5d4..3494e5ccaee6 100644
--- a/dev-python/xdoctest/Manifest
+++ b/dev-python/xdoctest/Manifest
@@ -1,8 +1,3 @@
-AUX xdoctest-0.15.8-pytest-flaky.patch 1126 BLAKE2B a96a688165b8781ce189f8963df89e6ee61b6f53508c78de0b95ab8c519ab5d618a835a78c21abe23d79d34cdd9c7b677430ff3bacb05d26c439afbaf886288d SHA512 20749730d000d50a80c660e536be465463d08162788c470f51721fd793e9cee9eb0138e1c82979dbed67976aec6041adc55c33f8d518ec9cd9eff2652ad8f56c
 DIST xdoctest-0.15.10.gh.tar.gz 191579 BLAKE2B 4836b773c3cf664c825433199b13ab7d3fe2c68538517bf5594797ad3f2f894d0132034fdafbc4502a00ec7393c19473fafe15fcf0257e3565592dc9907e3d71 SHA512 18c1a2774ae9331582610e3459a02f4e4de838218e7250af071570b2318f4c14330084b9fb903d88651fc40a4ba12b686ee6f2ca165edd8155e908ae4992a840
-DIST xdoctest-0.15.8.gh.tar.gz 185463 BLAKE2B a16578e6d50398ac80d950bcc9a05131880816e2ff3a15bd1489474e532f9b495d099dcea204d8375c884c6957aaaba9b276fbcb65b5717b2850314453f787f7 SHA512 ab4f991ba6e312bf6cf675c3bbeeae87c0666b96c911ee7727f64b8e4c13420bb91e0a7a955ebce73b3fb15625b52bbf1b67c6edfe91234655501060b17723d5
-DIST xdoctest-0.15.9.gh.tar.gz 190313 BLAKE2B 9980752ad5742a7c4a73418a3ace408c38a6bef6cd43ee5cd1893d6cb195a7c387c5062735b2c903725898ea670e3e6d8e683d4341dcf2dc9e17a2c723107910 SHA512 6a49fbe7f2535ab86ac7047406fbcc9f7e98c964664a95a115c3d945ba8157e4e70ab8c31edae6faee932cfd5e90201d883d9b4b10e2cea9cdc8ff14b5d52d54
 EBUILD xdoctest-0.15.10.ebuild 765 BLAKE2B 76106ed120b3af56642290aa67371e3390daee4881b9d64f4b376a365a3723c57981327108b8e37bf80a2b875ae2981e2f5c4e531e581c9952c000d141fa7aa6 SHA512 226ade6502c30804020c18ac7707105cf0aeee16a0e08382d4dcafaf8590da738880f7e391edf64ea1ed8da7b6affdd1c6c280fad26c978bee0d4d9d97b65805
-EBUILD xdoctest-0.15.8.ebuild 816 BLAKE2B 12f0e5958db5867207f0d971788601d0e8354fb29e5f4e1b908fd55ada84c0946d61e94152a99b5832453c580e1898e36af677da0eecb72a2cccc98c37cc7931 SHA512 651a24d1ebcbd6168ae4f50c7e5283f654c048a8106b40a416e24d7c9863d600e181f69eb97f2db91122bee99c0ed1b65aa4190820f5a0a9cb772f17afea936e
-EBUILD xdoctest-0.15.9.ebuild 764 BLAKE2B ba6b768d79fc4a40ce81421c6dfa93900a96e924ed2326a67c281cd49bb5f9cbc82b5f80298ffda49d58dac76748ffa27d21af0cf65e32567467386a4b282da7 SHA512 a0e7c30ca728b68c79e1fec5cbd5079365a369ea44a087e1602e419cb045de5b800b254af017e15d859f104f9b35b468cad6ef8381df40f28fca72653c0fb586
 MISC metadata.xml 426 BLAKE2B c5bbac93c627fdf15490b4867f0bd1e4d1fde469552cb8c7140c83e13130a4190f0dbfb3b67608ae454683630b937e3e8dc38ddf37b344aabff20ac4dc04e9d8 SHA512 0cb726bc6ef7d28b3ab744da3e3e770287826c8d4b1ef87fa404d9aa4b8d1e8fa3c8a2191cf2679bbc16335fbd50e5d887a1759c2866ac9b1cc48c2189b16637
diff --git a/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch b/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch
deleted file mode 100644
index 193b3f51bbac..000000000000
--- a/dev-python/xdoctest/files/xdoctest-0.15.8-pytest-flaky.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ec14218904fdd1c06597277deb11c8d3bb33c675 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Fri, 3 Sep 2021 07:27:22 +0200
-Subject: [PATCH] Fix test failure if pytest's flaky plugin is installed
-
-Disable pytest's flaky plugin in test_simple_pytest_import_error_cli
-in order to fix a test failure due to it mangling pytest's return code
-on import error.
----
- testing/test_pytest_cli.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/test_pytest_cli.py b/testing/test_pytest_cli.py
-index 25c8363..8ef9251 100644
---- a/testing/test_pytest_cli.py
-+++ b/testing/test_pytest_cli.py
-@@ -67,7 +67,7 @@ def test_simple_pytest_import_error_cli():
-             """
-         ''')
-     temp_module = util_misc.TempModule(module_text, modname='imperr_test_mod')
--    command = sys.executable + ' -m pytest -v -s --xdoctest-verbose=3 --xdoctest ' + temp_module.dpath
-+    command = sys.executable + ' -m pytest -p no:flaky -v -s --xdoctest-verbose=3 --xdoctest ' + temp_module.dpath
-     print(command)
-     info = cmd(command)
-     print(info['out'])
--- 
-2.33.0
-
diff --git a/dev-python/xdoctest/xdoctest-0.15.8.ebuild b/dev-python/xdoctest/xdoctest-0.15.8.ebuild
deleted file mode 100644
index 2fca586c7c28..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-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="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-#distutils_enable_sphinx docs/source \
-#	dev-python/autoapi \
-#	dev-python/sphinx_rtd_theme
-
-PATCHES=(
-	"${FILESDIR}"/${P}-pytest-flaky.patch
-)
diff --git a/dev-python/xdoctest/xdoctest-0.15.9.ebuild b/dev-python/xdoctest/xdoctest-0.15.9.ebuild
deleted file mode 100644
index 3f8b3416a702..000000000000
--- a/dev-python/xdoctest/xdoctest-0.15.9.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-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="A rewrite of Python's builtin doctest module but without all the weirdness"
-HOMEPAGE="https://github.com/Erotemic/xdoctest/"
-SRC_URI="
-	https://github.com/Erotemic/xdoctest/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-# dev-python/nbformat-5.1.{0..2} did not install package data
-BDEPEND="
-	test? (
-		>=dev-python/nbformat-5.1.2-r1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests --install pytest
-#distutils_enable_sphinx docs/source \
-#	dev-python/autoapi \
-#	dev-python/sphinx_rtd_theme