gentoo resync : 25.04.2020

8 files changed, 126 insertions, 14 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index f735170bcb5b..ee282dda5315 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -4,10 +4,12 @@ DIST Sphinx-2.4.3.tar.gz 5711784 BLAKE2B 624bfad7bfb75f568ea28063ac909685a3f563d
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.0.0.tar.gz 5903494 BLAKE2B 5183c98dad0fc05e263cbc1280f8230e6984f436cf6c19a34c51e2ef254a65b2a9fb579d3d0f77fe75f3936c6a11ffcace8bb4a24c9bb56e07629fbbfc3ba564 SHA512 7cd36eda10c13dcd16417b86c01eb361b2933836ce0a22e2728b4168356daa85f69db1b86352c3d2aa2445fa2ed77e7609ea22eb1970e93b8e25bdff52000ea3
 DIST Sphinx-3.0.1.tar.gz 5904304 BLAKE2B 95763a29ff94590d64f41fad79b6a481863b0ffc410bf6b5ddee32afd2830d015e9b737ce9bedfcfb5a92ce2e072235ededde76a0362d5dcceb0308c2ba1f21b SHA512 282d440fc8ce252f7bd91f1bac9a15b8fe1318210e2990ca5f25942d8126cab9fd257ed1fde3199dae65ea47763b21530549dfc46a18f76160b0debf426190d0
-EBUILD sphinx-1.7.5-r1.ebuild 3319 BLAKE2B f0f284deac398b44dfb6a7b64f482a40bb6703ff9bea54a71286db7951b5918164655dc5104dbcdddcb015e82c8295d5937e8f4a954922ea55e7ceb043152681 SHA512 1b81503cdac9bff7475fa86e2a6af60aa6476026072b93178ef646c84bec0c133ffd747a65f1b10d43050db24f6453c20c15f20413fc351e17da4f9984f0d643
-EBUILD sphinx-2.0.1-r1.ebuild 3496 BLAKE2B 0cb79ef7e7b65057e452b4cca2bc88e128dc79ec7d0cbd3b82f8c788618f5306d7f55edf3e467ce57e3d9b6b7f5e855d9d3626eb0af382d45b6d49cff60c156d SHA512 9ea3489bce3d1062b96de85fb4f6b0f488711cf4f1ccfce7057c5ce55bf9d5ebd3a4e26f68dcc1bf20b003e7caa323e8015ec1c68d6a2a102098c1292f12ffc4
-EBUILD sphinx-2.4.3-r1.ebuild 3667 BLAKE2B fc4b29f7206249c01b1cfd722fd459909baaefff50510109018292aea2ccda2bf2dd017e12ff1f73e214dae369058392e7b081bee816e6f44d9488796063962f SHA512 9256e1e85a57a795bdc64e7e6fc5410083aeae87a74dc3c18cd08ab39d52fe4d9aa51dcab18b171bdb95f80664d0402e5ab921f77a93ae033d67892a5f9bf857
-EBUILD sphinx-2.4.4.ebuild 3667 BLAKE2B fc4b29f7206249c01b1cfd722fd459909baaefff50510109018292aea2ccda2bf2dd017e12ff1f73e214dae369058392e7b081bee816e6f44d9488796063962f SHA512 9256e1e85a57a795bdc64e7e6fc5410083aeae87a74dc3c18cd08ab39d52fe4d9aa51dcab18b171bdb95f80664d0402e5ab921f77a93ae033d67892a5f9bf857
-EBUILD sphinx-3.0.0.ebuild 3911 BLAKE2B fac5d435ebb1681ea9e5fe5f9d52285bb26fcd88424e19e6c8431ab986c7d357a8e53edfdbc944029828fcb6fc17ab9b2221b4570a1e5830c62aa8e856fae82a SHA512 dc4b28c9479151edb2baba18e7930c0abb7816ab777456ecd1743a459112efa4b0e391f2b8e30d8f889abeb57efac9600abb521dfa01f6a4eaabf8fb04b39d22
-EBUILD sphinx-3.0.1.ebuild 3911 BLAKE2B fac5d435ebb1681ea9e5fe5f9d52285bb26fcd88424e19e6c8431ab986c7d357a8e53edfdbc944029828fcb6fc17ab9b2221b4570a1e5830c62aa8e856fae82a SHA512 dc4b28c9479151edb2baba18e7930c0abb7816ab777456ecd1743a459112efa4b0e391f2b8e30d8f889abeb57efac9600abb521dfa01f6a4eaabf8fb04b39d22
+DIST Sphinx-3.0.2.tar.gz 5904185 BLAKE2B b4ea11e0a19411b1903857d24c8443e14e45c30f488491543f13ba91fca5df0cbc8e75c83d78fd4d494cfd8a828f07f8da78033cb473f2b82da1acb6525961fe SHA512 d5f6f62b8d4b26383d0dd1cfd5e5712096def5021ecc845dc11fd1f35aba6f04ff16a70b9013a284cc5f478442cf880ffa39fb3afdf9f05a75a2f1ad96293373
+EBUILD sphinx-1.7.5-r2.ebuild 3214 BLAKE2B 6cdc38d318aa3552077cd38f7b73511cd9348f4e227f828ffdb8dee700ccb3261be15bcf74306c098010b8f901507f7445c292741dad894cd94da95838444c27 SHA512 233f3487d87b8954edef1b141d21501fed815f50f129348094d5e1f7fb12833912f8e06c4eef508190a75c28f4afeb5dbf3a6af6f4caebb8cc0290134f043b01
+EBUILD sphinx-2.0.1-r1.ebuild 3449 BLAKE2B b58a20c25e9cdfe7fa4b02f67e690e1a787313652e5cf272663eb778edb3cfd8fbb936424992137e465ed1f2f5ea0da8abe8d7f123f96f8b3179393efac01b80 SHA512 cbeca0ca6e2200ea4471b2f84eb6274eb84852cd11349a8a394acc852f2afefcfe81bb1588e69bb21a0cb9c716177722736c63c4bb1077758bf9b55842d8dbf6
+EBUILD sphinx-2.4.3-r1.ebuild 3620 BLAKE2B b41f968c101def2d8fbb92fdb369aaa1887b61d44896938aad60b458ddbe5bf9ae4b9950b8ab8f09a1eefadf44186cce54527c736214840d18c4bf3210e68160 SHA512 fd94b0dceab29c1bc1a77099d0fdbd215f2221fa7808078967d324ee4c626ce87c19c6829d3c794c812eb3818cebac05b29fda3767781201dc06ff9e317e70bb
+EBUILD sphinx-2.4.4.ebuild 3651 BLAKE2B b14676831537c65a91dbe5ad5b82226e37bb2d9539506d0a9aa4bd07b3eb6bbda93d55102f2541782be729ddc9a87f7e12a3af89c09f6eae9efdd3be456190d0 SHA512 0cd32ab907cb4789e6210b0026dd439fb984da29d485f31ce5c05253ad0ddd5827ab91c159e931d5968e5a7f1629d42d5bd5e51b19d70a52e594d6cb21360847
+EBUILD sphinx-3.0.0.ebuild 3864 BLAKE2B 9334668f0e35c0aa8acce51539256561cb620e9c94b2f4bcf83bd334d60f462d97929f60f443459ac7ada06f73c236f57231bc61e2c2fbd82966e98ef0aa7a86 SHA512 92f64e8c8d2bf747bd3ec56a7e98d13811b0ba2222c3093bc2cb3e6102e900ffe1d39158fd642bee3cdbc49141dae9a414a448ab0f8d2cf1a013428274a53a07
+EBUILD sphinx-3.0.1.ebuild 3897 BLAKE2B 55ad2ff1f0a9c78bdb0b5aa371bd0bb40f42f7beebb36302ebed8752f43f711b9fbe3baf2c2207defed610fd87c118a4a8cb5b2df9c19d544d1a7d4053efd6bb SHA512 8ab14804496c8739912826bc6d6bffaafa4073380d2eedb36e2d8bb908de40a85b2768238712b27a0b64288dfab6dd7030622bc0af7fa5062d3496668a9ad3ac
+EBUILD sphinx-3.0.2-r1.ebuild 3897 BLAKE2B 55ad2ff1f0a9c78bdb0b5aa371bd0bb40f42f7beebb36302ebed8752f43f711b9fbe3baf2c2207defed610fd87c118a4a8cb5b2df9c19d544d1a7d4053efd6bb SHA512 8ab14804496c8739912826bc6d6bffaafa4073380d2eedb36e2d8bb908de40a85b2768238712b27a0b64288dfab6dd7030622bc0af7fa5062d3496668a9ad3ac
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
index 1fa175f98d3a..1f2aa22be731 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r2.ebuild
@@ -32,8 +32,6 @@ RDEPEND="
 	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.5[${PYTHON_USEDEP}]
 	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	>=dev-python/sphinx_rtd_theme-0.1[${PYTHON_USEDEP}]
-	<dev-python/sphinx_rtd_theme-2.0[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' -2)
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
index e3f1dcf72370..5f5a93b9fe46 100644
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
@@ -36,7 +36,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	latex? (
 		dev-texlive/texlive-latexextra
diff --git a/dev-python/sphinx/sphinx-2.4.3-r1.ebuild b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
index f237709f572a..b921c1a7ab45 100644
--- a/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.3-r1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/typed-ast[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-2.4.4.ebuild b/dev-python/sphinx/sphinx-2.4.4.ebuild
index f237709f572a..d2610f3a6fa4 100644
--- a/dev-python/sphinx/sphinx-2.4.4.ebuild
+++ b/dev-python/sphinx/sphinx-2.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/typed-ast[${PYTHON_USEDEP}]
@@ -55,6 +54,7 @@ DEPEND="${RDEPEND}
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
 		app-text/dvipng
diff --git a/dev-python/sphinx/sphinx-3.0.0.ebuild b/dev-python/sphinx/sphinx-3.0.0.ebuild
index 1a71657e2863..1b53e6155e76 100644
--- a/dev-python/sphinx/sphinx-3.0.0.ebuild
+++ b/dev-python/sphinx/sphinx-3.0.0.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/typed-ast[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx/sphinx-3.0.1.ebuild b/dev-python/sphinx/sphinx-3.0.1.ebuild
index 1a71657e2863..ea19d76fea3f 100644
--- a/dev-python/sphinx/sphinx-3.0.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.0.1.ebuild
@@ -35,7 +35,6 @@ RDEPEND="
 	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
 	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
 	dev-python/packaging[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		dev-python/typed-ast[${PYTHON_USEDEP}]
@@ -55,6 +54,7 @@ DEPEND="${RDEPEND}
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
 		dev-texlive/texlive-latexextra
 		dev-texlive/texlive-luatex
 		app-text/dvipng
diff --git a/dev-python/sphinx/sphinx-3.0.2-r1.ebuild b/dev-python/sphinx/sphinx-3.0.2-r1.ebuild
new file mode 100644
index 000000000000..ea19d76fea3f
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.0.2-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} 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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/snowballstemmer[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	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_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+	sed -i -e 's:test_latex_images:_&:' tests/test_build_latex.py || die
+
+	# fail under pypy3 (some because of missing typed-ast)
+	# revisit when pypy3 becomes pypy3.8
+	sed -i -e '/def test_partialfunction/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_typed_instance_variables/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_autodoc_inherited_members_None/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		-e '/def test_cython/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_autodoc.py || die
+	sed -i -e '11aimport sys' \
+		-e '/def test_autodoc_typehints_signature/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_ext_autodoc_configs.py || die
+	sed -i -e '/def test_annotated_assignment_py36/i\
+@pytest.mark.skipif(hasattr(sys, "pypy_version_info"), reason="broken on pypy3")' \
+		tests/test_pycode_parser.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"
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}