gentoo resync : 23.09.2020

3 files changed, 2 insertions, 110 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 7bb4fc8f0964..11a2c2c0c849 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,7 @@
-DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
 DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da4aea10ee18ecae658a69a9bb797f83b0d11b41b8405bf18b2472ea7fd501bea85382c20c5f2a9d5b14a032428 SHA512 cd35b7ebdf4eb41fb3a58706333ca4328fbf9b37999ad1bcc751f9769f0a294464e4def019a403fcd2204ca963ef641c35c957a4145eb50af07573d21df8c74d
 DIST Sphinx-3.1.2.tar.gz 5934433 BLAKE2B 4ed04dcff4db412ea1f749c0b90d0c38197bbc95607bcc719522f0690d6fd58aa59b87a053c036e9b3c982e9c0f6fa9b6b67f903cb7d9e6fea3a13d99b7be297 SHA512 d1b55a603ea4a76d2315e170b8ba7858caf1658660e9983034918bd265c505f0e5157ab9d9cebc970261646ae0959e1cf75562b01b73bf3a380e712393a735b9
 DIST Sphinx-3.2.1.tar.gz 5970067 BLAKE2B 6158d31390c9b07aa3abcdc4eb7ed827cf2160192a2c53ad845f07d5027cc4bd65264ea1114e78e06f9652a8788a8d0e992a8988382787a05bf507a73618cd96 SHA512 3f0f49036a44938abd470c2f825a0eeeeb818daf3dfbb3bc5c746b64305b5fe66c1c34d9703eb9420b2b347247c122825ddae1b6c28c88c249206151f39e3bdb
-EBUILD sphinx-2.0.1-r1.ebuild 3449 BLAKE2B 2111f0525ba29ef2e6c0fb7001ca49b52e645f1a8f884391a85418d040fb4a90a4a1df2a1896d7eeacb86304aded025bb043afd748fe8e0fae349d7d80bc8970 SHA512 17051761d94c11eb95cc1e3e4b946407432b895ebe1b2fccf1cf9187fb859e5edd525bd52c79347747b0a8dd93c0d32e3c9fcaf1577118fc3c97ad71118445aa
 EBUILD sphinx-2.4.4.ebuild 3644 BLAKE2B 28df6a37d7fab6255e893501fbc4a45f427f1928f9e77420806f8eb2bcc2b23f05d2d5eb2b9a04258913555f1401c94c968811b270f4c3a0085340bd7e334ff5 SHA512 f6332488785a0c6795348b76db72a80e3bfc839a3ded793e12ae185941ebbba062f91c10f7dc8aca111bb951f62dc8f86fdd946a80e7253dbd14735dd5d6648c
 EBUILD sphinx-3.1.2.ebuild 4766 BLAKE2B 88bbb6fd8d6fd89e4aa5b57d0810f115825d72c73a7db612cd2c9ed18b82e65b0b6549d1d51bc6de136002f9aa8af7e282fc2dc7a4563137149d66942f5da2c6 SHA512 bd06851b66530079903f95050be806b872d86603f8beb59f7f598567cc43f5e43c88b2f98c76cd5e7fc393da5150df8aada0f2b37b01265970ee85d95687b9cb
-EBUILD sphinx-3.2.1.ebuild 4782 BLAKE2B 8d58a1ce2044572d5f684da65d4032ca2043304a4a5dc3efb0f988a91be4addd7d0319d4cb724c6b54eb1a1d758c59d4292ccc96f1903ea4371a0cf80d5162b6 SHA512 ff3d07c2a7ecd27c0cec2735b99a16976b7781f2e87e776bacb5bac8efbfd85f75b9b97dd67ef0fa48b67ad40784c114d2ce2531e2df9f1b562e0b250107dc31
+EBUILD sphinx-3.2.1.ebuild 4773 BLAKE2B bacbc635f142bc61e76c00929168ced40cccaf6b15820df46a6ff2e70d2074e187a5b3e01be15d94a27eaa7dd23ea5bd9527f53a463498e44a0e8de1e46f1c09 SHA512 f5b8f731a48271b1500697161af150f5027078e1f1dd1024295b6705118ed1c6c4f7d578982ea86f3f5861cc58b906cdd3b95ae41890fc1971c683d415394388
 MISC metadata.xml 510 BLAKE2B 878684f285906bb31649cb244f7af0e62ce854d20d260c269c0f1764f142adff08ce690fd778e3932181fa62947a2fa5521ee76c17871d15f73783dbd7730388 SHA512 496e3380982af69d59b05c94b773ff6e9449023e6b9bd314876e952fc54dd23db4a09ad24dfddfd752656445c71631503ae898ad778ad1702385057b047ebaab
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
deleted file mode 100644
index 4d651f7dfe62..000000000000
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/"
-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"
-
-# Tests automagically use latex, bug 667414
-#REQUIRED_USE="test? ( latex )"
-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}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)
-	!dev-python/sphinxcontrib-websupport"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		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
-	sed -i -e 's:test_latex_doc:_&:' tests/test_build_latex.py || die
-
-	# requires specific locales
-	sed -i -e 's:test_babel_with_language_:_&:' tests/test_build_latex.py || die
-	sed -i -e 's:test_polyglossia_with_language_:_&:' tests/test_build_latex.py || die
-
-	# fail for unknown reasons. TODO: find out why
-	sed -i -e 's:test_build_latex_doc:_&:' tests/test_build_latex.py || die
-	rm tests/test_ext_imgconverter.py || die "Failed to remove broken test"
-
-	# fails when additional sphinx themes are installed
-	sed -i -e 's:test_theme_api:_&:' tests/test_theming.py || die
-
-	# fail under pypy3
-	sed -i -e 's:test_partialmethod:_&:' tests/test_autodoc.py || die
-	sed -i -e 's:test_partialfunction:_&:' tests/test_autodoc.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}"
-}
diff --git a/dev-python/sphinx/sphinx-3.2.1.ebuild b/dev-python/sphinx/sphinx-3.2.1.ebuild
index ed45daf8de54..c46ed0085541 100644
--- a/dev-python/sphinx/sphinx-3.2.1.ebuild
+++ b/dev-python/sphinx/sphinx-3.2.1.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 ~riscv ~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 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 RESTRICT="!test? ( test )"