gentoo auto-resync : 19:02:2025 - 00:15:15

3 files changed, 157 insertions, 10 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 5aaa616c3c20..d51f117854d2 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -3,7 +3,9 @@ AUX sphinx-4.3.2-doc-link.patch 745 BLAKE2B 94f190d63168be99c4719a917f0a1210c562
 DIST sphinx-8.0.2.gh.tar.gz 8264835 BLAKE2B ed6e321a1e58341609d88993c418ec1a0a580683ed28895077322fdba839d5c158007d65d5349d4d53c5e3b49ae823142cc6eb0203812580ebbb5b95247bf157 SHA512 5e9f38af91d7a80b6a80a80ab26adbebc1c3303996182a58eed9120ed896c5bfde022616e116e8cb8195fe03741e93fd97dcacccf492912ab147c5bfcb79213d
 DIST sphinx-8.1.3.gh.tar.gz 8245194 BLAKE2B 43e0b2bc3214e01c55da356144c7e2e27dd8202b5c2dda6f6e1768c4ba4fa968180ff97f41c3b97e3cbeff1dad1199cd19385ae34dc0cb4250af60e157b3bd1f SHA512 b1d0fe9586b11083103449a04443884d06d2dcab2d0bcf66d07ef97543b5e92da60e3c02e6f8ba9e04a6d7bdd62c75ef9d3f790411753fcda2a67e0fbf6a2d86
 DIST sphinx-8.2.0rc1.gh.tar.gz 8283034 BLAKE2B 7387106d4fc41595dfff84611f7ec2abd6f8cdc3692c8848689c2aa14d6b157b70c19dbeab8fd2a8c6d5b50993e31b37efdecc3dc39894d9b3ecb17b72733d90 SHA512 57bebe1ac19176779ed9d27ad2e981f580ea30872fdb909d47f7474608f7b02b7a531fee8208d1625ae252cb05301daa84a8b241b4d3b431f5a5229be0c35280
+DIST sphinx-8.2.0rc2.gh.tar.gz 8283673 BLAKE2B 8949600e0befd6992c1530fcd10a8f57930696f4d41c79785e1ea31b0ef59847858d4430803f3888847d53587d63ca21c107f03d4ae9638d00f625d9dc127ed6 SHA512 92f93727426a58c3178e294e0a65fb73e50cee7c138266ce1a1f25b109eea2167c69814cc9744bbfb5362531c5039e672ab56b0075d2b258c25aa0c2a17455e9
 EBUILD sphinx-8.0.2.ebuild 5295 BLAKE2B 6f22b9f2707e428c45f09e1c047ae321752c4f6c0cd872063dea2dc7fbe7d52fea8db06002b6af121dc68b8f9cf73542af39f16bffd258546223aff2dd27513b SHA512 2e56af0474b43734de6d5bd08b45a975d669cdef8e52952e58f264d268ee86ea26ed851fe9eb356c141aae19037e877e9c8a620a9b8eb88afe90055c29002e6b
-EBUILD sphinx-8.1.3.ebuild 5327 BLAKE2B c881284ca74737f2860c6ba764586c64aed5ff5bf244772f1694d725883ac54455b211d565f080aba934fe427ff8d4e0e901c156bfe27019733e9b3db728f7a8 SHA512 96d955d7fbf1dcdd158a2c257d33304391399eed8a7ac756cb3bbc91e0679653ef317c53607287127fe6a80644c7bfbdb3198bf863f2c552f622e95eda87f55c
+EBUILD sphinx-8.1.3.ebuild 5291 BLAKE2B 098c4923564705c44da1fdadbbebd521eb06dd92cb53541ba2e8118ab02444e307bb1d00d21b0dc0e40c6a057b538758481ad3584b3c3c69bfdac6315635a8d5 SHA512 99f38e955f291c00249c07a5eaeca60e504da73c401073307b3ed2f26dc7f7e8cc71ba713efbc5c1b22851056ec1503b3db71bd09c91400fb1ca320cf2b66fa2
 EBUILD sphinx-8.2.0_rc1.ebuild 5152 BLAKE2B 1f9270be730281d799e1750fa1c0a04af9ef74303ee7a5c88e157b089a71ac8210c5006888d06ec45867772ac6a1f8252cadd5ccbeef0cddbc6a6c7cc0ef6cfd SHA512 27de4e6ac159a2fbc0c403549b86ee57874a51e88a8fc5300dc7f299d78c095340f86968be7d000ed46c2f9fa36725cd347f828cd6e947ee036cae31f8f6f7a9
+EBUILD sphinx-8.2.0_rc2.ebuild 5116 BLAKE2B a710c9d7c96d4d402b407237b53bdf94ad70acfc113123582dec0e579789829067818aa3c5b8e8d239448e33c841bffdb3d01d2aa570275c080577ebfa3e223d SHA512 a2ed2a69b1306120bc6427b5fad34ef3113944bea9ff888068ead5393400726f544bad371106253d1281367213e136c8f8702a136fb0402a1de13c44c051331d
 MISC metadata.xml 568 BLAKE2B ddb7175070df6da4088813cc6b66f25bb4364e2619b1e7da94370f7ce8e73b68b12f618412f81e6be57fcb0c60c10e3913f26a6a578b0f9defa7b9ee8091fcde SHA512 d32b37cbe88f5e3db0c6968bc7aa22c7edfb3794bf7c62facd17e7ae1f4f0fbfc7c9f5512230cce16ed32e2ebb70c23dfe9b36ce38785c5f5b76585410313214
diff --git a/dev-python/sphinx/sphinx-8.1.3.ebuild b/dev-python/sphinx/sphinx-8.1.3.ebuild
index 596f141e65bb..f8e2a4439bd0 100644
--- a/dev-python/sphinx/sphinx-8.1.3.ebuild
+++ b/dev-python/sphinx/sphinx-8.1.3.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
+PYTHON_COMPAT=( python3_{10..13} pypy3 pypy3_11 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -103,15 +103,17 @@ python_test() {
 		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
 	)
 	case ${EPYTHON} in
-		python3.13x)
+		pypy3.11)
 			EPYTEST_DESELECT+=(
-				tests/test_extensions/test_ext_autodoc.py::test_autodoc_special_members
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_format_fully_qualified
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_none
-				tests/test_extensions/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+				# TODO
+				tests/test_util/test_util_inspect.py::test_is_classmethod_descriptor
+				tests/test_util/test_util_inspect.py::test_is_builtin_classmethod_like
+				# minor repr() differences
+				tests/test_util/test_util_typing.py::test_restify
+				tests/test_util/test_util_typing.py::test_stringify_annotation
+				tests/test_util/test_util_typing.py::test_stringify_type_union_operator
 			)
-			;;
+			;&
 		pypy3)
 			EPYTEST_DESELECT+=(
 				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
diff --git a/dev-python/sphinx/sphinx-8.2.0_rc2.ebuild b/dev-python/sphinx/sphinx-8.2.0_rc2.ebuild
new file mode 100644
index 000000000000..4cf5c3548b7a
--- /dev/null
+++ b/dev-python/sphinx/sphinx-8.2.0_rc2.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{11..13} pypy3_11 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+MY_P=${P/_}
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="
+	https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx/
+	https://pypi.org/project/Sphinx/
+"
+SRC_URI="
+	https://github.com/sphinx-doc/sphinx/archive/v${PV/_}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="doc latex"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.14[${PYTHON_USEDEP}]
+	>=dev-python/babel-2.13[${PYTHON_USEDEP}]
+	<dev-python/docutils-0.22[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.20[${PYTHON_USEDEP}]
+	>=dev-python/imagesize-1.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1[${PYTHON_USEDEP}]
+	>=dev-python/packaging-23.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.30.0[${PYTHON_USEDEP}]
+	>=dev-python/roman-numerals-py-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-2.2[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-applehelp-1.0.7[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-devhelp-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-htmlhelp-2.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-jsmath-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-qthelp-1.0.6[${PYTHON_USEDEP}]
+	>=dev-python/sphinxcontrib-serializinghtml-1.1.9[${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? (
+		app-text/dvipng
+		>=dev-python/cython-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/defusedxml-0.7.1[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-67.0[${PYTHON_USEDEP}]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		virtual/imagemagick-tools[jpeg,png,svg]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/sphinx-3.2.1-doc-link.patch"
+	#"${FILESDIR}/sphinx-4.3.2-doc-link.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	# we can't use distutils_enable_sphinx because it would
+	# introduce a dep on itself
+	use doc && build_sphinx doc
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local EPYTEST_DESELECT=(
+		# less interesting failures
+		tests/test_builders/test_build_latex.py::test_build_latex_doc
+		tests/test_extensions/test_ext_math.py::test_imgmath_png
+		tests/test_extensions/test_ext_math.py::test_imgmath_numfig_html
+	)
+	case ${EPYTHON} in
+		pypy3.11)
+			EPYTEST_DESELECT+=(
+				# TODO
+				tests/test_util/test_util_inspect.py::test_is_classmethod_descriptor
+				tests/test_util/test_util_inspect.py::test_is_builtin_classmethod_like
+				# minor repr() differences
+				tests/test_util/test_util_typing.py::test_restify
+				tests/test_util/test_util_typing.py::test_stringify_annotation
+				tests/test_util/test_util_typing.py::test_stringify_type_union_operator
+			)
+			;&
+		pypy3)
+			EPYTEST_DESELECT+=(
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_exception
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_ignore_module_all
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_inherited_members_None
+				tests/test_extensions/test_ext_autodoc.py::test_autodoc_subclass_of_builtin_class
+				tests/test_extensions/test_ext_autodoc.py::test_automethod_for_builtin
+				tests/test_extensions/test_ext_autodoc.py::test_cython
+				tests/test_extensions/test_ext_autodoc.py::test_format_signature
+				tests/test_extensions/test_ext_autodoc.py::test_partialfunction
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_autodoc_process_bases
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_decendants_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_builtin_function
+				tests/test_extensions/test_ext_autodoc_autofunction.py::test_methoddescriptor
+				tests/test_extensions/test_ext_autodoc_automodule.py::test_automodule_inherited_members
+				tests/test_extensions/test_ext_autodoc_preserve_defaults.py::test_preserve_defaults_special_constructs
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+				tests/test_extensions/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+				tests/test_util/test_util_inspect.py::test_isattributedescriptor
+				tests/test_util/test_util_inspect.py::test_signature
+				tests/test_util/test_util_typing.py::test_is_invalid_builtin_class
+			)
+			;;
+	esac
+
+	# note: pytest-xdist causes random test failures
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest -p rerunfailures --reruns=5
+}