gentoo resync : 20.10.2021

4 files changed, 2 insertions, 201 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 8d8227f8032c..93ca88f1d7bc 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,6 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
-AUX sphinx-4.1.2-py310.patch 2404 BLAKE2B 9768ede1a7272497ec5f266ed676fe114d6b72d54d8369b28c98a2af20094050a04f70c0e5df93580ed7e3655a0bfb81a4ebf79bab1f658b121f97c8d8cf7d71 SHA512 f49567b0acebfd1187db7f9a4fc5d20bfa9a2d250a8a987ff7ac49bc29d1877755fd74d60c8318d82be34c50d4bddf427e764417366509abdbb43ff3d119b82f
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
-DIST Sphinx-4.1.2.tar.gz 6373677 BLAKE2B a78df4302520898c8708a75129baf28dd2dcde2dcbb4147d8246a2dd7907ae2af2ed8cf1d259ff1065dbe987fd918a7153831a9f5c16e79834c41f86b6031e41 SHA512 1fe998de7b8fc47989e186835748b7fb5d0b523db95434515b6af29b56d28372f2f92ab917c27cbed51aa0cad13175eda8bf4fc93a8726eb5e93e9bc6995e457
 DIST Sphinx-4.2.0.tar.gz 6503692 BLAKE2B a3cc73c215be6859f285b92d651f2fe60f731340e7c003d3b275247593d1e641a25618817f67e7f3d8767724d6e98a6d63493bea340c7171e4e3da384da776e2 SHA512 6c6a2424362805b758c43136a9293dcfb02d45af6e6dc2dd7ed9382f6ae04ecfbd416efeecb42219b67d026a4a0b007500e87b20d81847ab48e2ccfcdca52e75
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.1.2.ebuild 4471 BLAKE2B a371b3fc15df849200f39d3ec4a99fb4edbf2ca7a809529d6041e4ad43fa208fb91a05ec51799d5abda49b5ebe5698c2f0c6b2d042ee3a404c47f38ea345064e SHA512 5e4910cba1a5441802ef54aa0e1f95b8e78967aa89924e31e1df6196f1c6d9dc690113acd4b46939c928b8eb90bdcc656f42e977e71ff12795f0334cd48a1824
-EBUILD sphinx-4.2.0.ebuild 4264 BLAKE2B 7b1c505c316e4d5d20cec6026011714e2b8afaa9ab2de627e438530a41b6bcfe14bf94f2f09b95bee41415c908b763497405bf0618e85b0deac365eac7bb1af3 SHA512 fc7b2200ca07e67d0b98d625afba62e40f76a7d490994ed16985def06eff42154bc9ae2eddd33f3b51b457360388a2c19fc62977dfdb37ddb0f1b0ab07e5f697
+EBUILD sphinx-4.2.0.ebuild 4256 BLAKE2B d8745129ad938bc336ca52ff0931c3d88809280a1d452d907edca1e05064668b601248cb85a049d40a5dff79d8e91ca41d89d75285ff54d75c032a18a1ec403f SHA512 ba9ae1638031845f35eab34b53be582e8e6440ba540b47f4d593f14323e3c2c4ab6fbf873a08ffce007bdec4e24c3f450cfe3b4a223a7acb8cee8e2d6a9b553e
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch b/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
deleted file mode 100644
index 8c03d1f66721..000000000000
--- a/dev-python/sphinx/files/sphinx-4.1.2-py310.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1fd5f746539d3e02886032fae8d53af0c2f6ecdd Mon Sep 17 00:00:00 2001
-From: Takeshi KOMIYA <i.tkomiya@gmail.com>
-Date: Fri, 30 Jul 2021 01:27:38 +0900
-Subject: [PATCH] Fix #9512: sphinx-build: crashed with the HEAD of Python 3.10
-
-Recently, `types.Union` was renamed to `types.UnionType` on the HEAD
-of 3.10 (refs: python/cpython#27342). After this change, sphinx-build
-has been crashed because of ImportError.
----
- CHANGES               |  2 ++
- sphinx/util/typing.py | 12 ++++++------
- 2 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/CHANGES b/CHANGES
-index a643bfe841..70eb8db93a 100644
---- a/CHANGES
-+++ b/CHANGES
-@@ -16,6 +16,8 @@ Features added
- Bugs fixed
- ----------
- 
-+* #9512: sphinx-build: crashed with the HEAD of Python 3.10
-+
- Testing
- --------
- 
-diff --git a/sphinx/util/typing.py b/sphinx/util/typing.py
-index f1723c035a..012d32e524 100644
---- a/sphinx/util/typing.py
-+++ b/sphinx/util/typing.py
-@@ -33,10 +33,10 @@ def _evaluate(self, globalns: Dict, localns: Dict) -> Any:
-             ref = _ForwardRef(self.arg)
-             return ref._eval_type(globalns, localns)
- 
--if sys.version_info > (3, 10):
--    from types import Union as types_Union
--else:
--    types_Union = None
-+try:
-+    from types import UnionType  # type: ignore  # python 3.10 or above
-+except ImportError:
-+    UnionType = None
- 
- if False:
-     # For type annotation
-@@ -114,7 +114,7 @@ def restify(cls: Optional[Type]) -> str:
-             return ':class:`%s`' % INVALID_BUILTIN_CLASSES[cls]
-         elif inspect.isNewType(cls):
-             return ':class:`%s`' % cls.__name__
--        elif types_Union and isinstance(cls, types_Union):
-+        elif UnionType and isinstance(cls, UnionType):
-             if len(cls.__args__) > 1 and None in cls.__args__:
-                 args = ' | '.join(restify(a) for a in cls.__args__ if a)
-                 return 'Optional[%s]' % args
-@@ -337,7 +337,7 @@ def _stringify_py37(annotation: Any) -> str:
-     elif hasattr(annotation, '__origin__'):
-         # instantiated generic provided by a user
-         qualname = stringify(annotation.__origin__)
--    elif types_Union and isinstance(annotation, types_Union):  # types.Union (for py3.10+)
-+    elif UnionType and isinstance(annotation, UnionType):  # types.Union (for py3.10+)
-         qualname = 'types.Union'
-     else:
-         # we weren't able to extract the base type, appending arguments would
diff --git a/dev-python/sphinx/sphinx-4.1.2.ebuild b/dev-python/sphinx/sphinx-4.1.2.ebuild
deleted file mode 100644
index 03135e278977..000000000000
--- a/dev-python/sphinx/sphinx-4.1.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-htmlhelp-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/sphinxcontrib-serializinghtml-1.1.5[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	# https://github.com/sphinx-doc/sphinx/commit/1fd5f746539d3e02886032fae8d53af0c2f6ecdd
-	"${FILESDIR}/${P}-py310.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	# remove unnecessary upper bounds
-	sed -e '/Jinja2/s:,<3.0::' \
-		-e '/MarkupSafe/s:<2.0::' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
-		tests/test_ext_autodoc.py::test_enum_class
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sphinx/sphinx-4.2.0.ebuild b/dev-python/sphinx/sphinx-4.2.0.ebuild
index 2395e15eb80a..3bebfedd66bc 100644
--- a/dev-python/sphinx/sphinx-4.2.0.ebuild
+++ b/dev-python/sphinx/sphinx-4.2.0.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P^}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc latex"
 
 RDEPEND="