gentoo resync : 17.07.2021

4 files changed, 148 insertions, 15 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index a3930da8bbfe..84bf005bad1a 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,11 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 AUX sphinx-4.0.2-py310.patch 981 BLAKE2B d4f64e7b0cff10ea4c348735820d6cbb595c15e36185107a25819b11af2d79b7776296f167bcceefd0b2065af0611b5b2d3fb1e8ffc8d1d0ef14cab8f42671ae SHA512 0dee3be88a4dd39d5a34b8e388dd53609b586fb41473560e96ba8c850819b2da41d69e6e97af7f7a154bf4555f3020501409b2a54618605bef0d6628dc2f44e6
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
-DIST Sphinx-4.0.2.tar.gz 6162889 BLAKE2B c0309ca6752a76c11b5071d3ee368e80499bf68ca51a7f396be10d15b9bf9b03f85de3fef2b4e3c4795de99efa78af42a5b95b00d1f737952e6775631e63128a SHA512 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec
 DIST Sphinx-4.0.3.tar.gz 6164298 BLAKE2B 60726ed4cc4f92910bcfff20dde09beef89e4c171b6f12a327e981df8fa6569a901c0b8e994cd66263b87056548f9f966a2e3049341447ad28797bf120a42a70 SHA512 8dd561b220779efb4cf779f46b342a298f18bfeb7670e0485ba8fcae7a03b2bd30368b441237ed597e1d8f001e35bae13a7d4d44d6921a4fa1b8a7804a5850c7
+DIST Sphinx-4.1.0.tar.gz 6302885 BLAKE2B 7e2eafa236173c0fe7d761d1692ff8bb0c12ad8fae2894e2088fff0415d085a3ea652c59d4efc94788829c4261cbee161d85a5c35d6a282fb1a201f658425bb7 SHA512 482378b85b51e74bc2c841bc5ac7b7d5a0034b28e62d36182972439a1e48ce5faaa82e6c3daa35ff6a3f1b1ed1c4187564c77806e6d1804dae0f2c24262adbe6
+DIST Sphinx-4.1.1.tar.gz 6373009 BLAKE2B dd19089149d626a0a65af4ff1cd8acf5a5ea8d00b6c940d2d7c5e1c459ae37d993d82652114b9144a80971275a6e346942dce9a6a3798220dc77e0f88d8fc2e1 SHA512 6250fa568f9952471f3cb433a1e7a053c779540c0c049d0e0bad4f2b754935f8c9f351a297349bc15f1dcb4b152a550771f2f381b2eee92a68759e034fce23c4
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.0.2.ebuild 4294 BLAKE2B 192a601e803f47438f757baf4f0b981a19802c46c6f0299ac3990ebd5eedbcd8ad37ed6b378df3b03fda92b92db6d2d955f917c7c52bc7b4184a7dc988ef8e82 SHA512 ae00b4d6e7455fa035fcf5a5a67fe9fb9e7d0a72c8b1b5bcda75152378e855213181c294f773f1bb7b974ef3adc29dc85a3aba92af3f025e4edf9075e7038cf1
-EBUILD sphinx-4.0.3.ebuild 4301 BLAKE2B 96935c2160318d1cf0319b2a7d6d0a07922c2648a22ad7299d25a23cedf2eb48e2bdc7ee2002a852eb5e073b26a8ac07ea23e874da8110313cdccbab66863bd1 SHA512 d45a38d1d526c9f5b99fe5a37eab96178d449cfb9fd5ec6a5149768db007e97ca492876670232ea0ef8c57559aa275e77b833213d266eef4882dd92037eff9f3
+EBUILD sphinx-4.0.3.ebuild 4293 BLAKE2B 70552e6b75fa50af4d5af1aa491e7bc8f1aa3103e609c7cfec110ed466d624ec4d0bc1e291157d59383e25bdd4b7d90f794e0213394713b323a131831fcc4001 SHA512 01192407c223cdc47861631e4f211d526ae4f3c9546b91bd75d7a09d05adf9d8e53c8cb23eadcaf5a8cc7acf90772a0a0624df1e92146f81b17273b4dbffb16b
+EBUILD sphinx-4.1.0.ebuild 4343 BLAKE2B 78d3a74da8b013e5d80b0731ad1a6f5b19ae1e991f96c1a28b03234822f78ccea813275ecef944b75d16f75908d7ebfdc6b7077e291a8b86b4bb7f2d5833569c SHA512 b560de6ba97660341f97b3ad657fc62bd3d2ac56e749ec0576cc967da54698481e365300c95251d257a393209aba97bf13e6ea2b508a4d77f195ba951c8dacd5
+EBUILD sphinx-4.1.1.ebuild 4359 BLAKE2B d274c51e81c11455ac5c7eb17891ef9056b6f8bf26b75413afff72196df610c15ba5b1c9dde354e8e495a9e910bbfcc7f33cd207eea5741a14fc6fbe3aa03356 SHA512 09afc62e84ded1a76f1b967962fd8f33e77a4e2ca2a1e61883e1990e4cad1074405f38c3f9e6c375e1ea37af15acd3498d5254e7a459d264556e455d5f08ed05
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-4.0.3.ebuild b/dev-python/sphinx/sphinx-4.0.3.ebuild
index 343eaaf18187..938ba29ebe50 100644
--- a/dev-python/sphinx/sphinx-4.0.3.ebuild
+++ b/dev-python/sphinx/sphinx-4.0.3.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="
diff --git a/dev-python/sphinx/sphinx-4.0.2.ebuild b/dev-python/sphinx/sphinx-4.1.0.ebuild
index 7cc217f2e354..998f34e2eec6 100644
--- a/dev-python/sphinx/sphinx-4.0.2.ebuild
+++ b/dev-python/sphinx/sphinx-4.1.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -36,9 +36,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-	' python3_7)
 	latex? (
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
@@ -60,7 +57,6 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-	"${FILESDIR}/${P}-py310.patch"
 )
 
 distutils_enable_tests pytest
@@ -108,23 +104,27 @@ python_test() {
 		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_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
 		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_typehints_signature
 		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
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/sphinx/sphinx-4.1.1.ebuild b/dev-python/sphinx/sphinx-4.1.1.ebuild
new file mode 100644
index 000000000000..4a19323cee98
--- /dev/null
+++ b/dev-python/sphinx/sphinx-4.1.1.ebuild
@@ -0,0 +1,131 @@
+# 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"
+)
+
+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 }
+}