From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 28 Apr 2019 09:54:45 +0100
Subject: gentoo resync : 28.04.2019

---
 dev-python/sphinx/Manifest               |  10 +--
 dev-python/sphinx/sphinx-1.2.2-r1.ebuild |   4 +-
 dev-python/sphinx/sphinx-1.2.3-r1.ebuild |   4 +-
 dev-python/sphinx/sphinx-1.7.5-r1.ebuild |   4 +-
 dev-python/sphinx/sphinx-2.0.0.ebuild    | 106 -------------------------------
 dev-python/sphinx/sphinx-2.0.1.ebuild    | 106 +++++++++++++++++++++++++++++++
 6 files changed, 117 insertions(+), 117 deletions(-)
 delete mode 100644 dev-python/sphinx/sphinx-2.0.0.ebuild
 create mode 100644 dev-python/sphinx/sphinx-2.0.1.ebuild

(limited to 'dev-python/sphinx')

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 96220079a5fe..f5cc79ec075c 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,9 +1,9 @@
 DIST Sphinx-1.2.2.tar.gz 3143671 BLAKE2B a21b2a060363ac86832a6a28a623ed410ff0bb39ca3c9c58618ade88f4305996e54c559bb588c518597e31a73fc16e0c37fc57950eb077179f03715dfee72729 SHA512 44073c215f9d0e7f6c7bc91cb85b0508a96e5cfff5f940fef86e2fc6f11281d03b54e87e51e5a99a23e96b470a93f3af86a6a3ab7c317c747406c55b4c37791c
 DIST Sphinx-1.2.3.tar.gz 3200548 BLAKE2B 42033c59e6e38247af12c78cb4f69c73b1dfa883aa8a9e6c180bb74de666b45faef24a55c0bfd3aa1f22bf3e632e0e95016eb1bea54e8b5ebc7df78756763b5c SHA512 00346516e826a65145a3a7fd25ef7cee569ae7fdcc0c1bec3a7301fc08d5d8730d02eee792c3efedfcac17e712ea7e2ad70ea1fcdedc11720ad54f6bcb51ad05
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
-DIST Sphinx-2.0.0.tar.gz 6011308 BLAKE2B 72ec668522b803c07a76be086a27d2f8fb844558fc3d3a9fbaa7a191e570c23e3baa951873f68d3b54c48d8cfa770f8fd1549b718a7e760b7691bb686fe9e83d SHA512 283e18514262366e0aebc23f1e48ce7fa3591e48572525c832f96ec4f943463e19904c67ab06a4b3244119750c63dc496d4a4142e1e4a55e0b4ebdc748cf6aa6
-EBUILD sphinx-1.2.2-r1.ebuild 3045 BLAKE2B 315adfce3238e7b3c21465cd16e9a682255df98cf1c2289e3611a946f3642a9df204952d15a5947d1db2e4edaf909457bf78fc995e9d2d7b319ed8d82bd4ab17 SHA512 74d6530a5e4db4dc519eda8e4c9958fc54eb0767b00d6a69334a7c9e515bc878781c09b20e4ea5d7a23e55f3aa3093940be58013a42ef4507cf6fa2b3109007c
-EBUILD sphinx-1.2.3-r1.ebuild 3104 BLAKE2B 5def64661cf250461a510307eface9a79577a19f8a0c347e6c3a2b5c0861bdcb075204d26e56030535fad6a96978344c650907e15aed03a859d4de9f6709252f SHA512 2106fa9b8fd5fb65da085464a9d6133cf07bab371fcce363ed0154fb0a86543047910b571d71f8f28e523a311f6e193cd3e29d777b28d6109681cf2ada1fdd9f
-EBUILD sphinx-1.7.5-r1.ebuild 3300 BLAKE2B 2bc93273d9fc49adfa033126c59f3383754537ef81632e6b47f3707fbcd62895325869078ff6cb5a6f4ade8439ce676585be2954832a4b6d2fda5aee67fa7999 SHA512 e90d2932c53cdb9d0628083441d48cbfd1c1aa3bb215058a55dee6977a1f2d7bfd36ea7e3c220c3b629c03805f0f7327597f8bcf0a87db71228ad639ada188b6
-EBUILD sphinx-2.0.0.ebuild 3492 BLAKE2B 8ceb448bd085ff9dfaf5dcd6d42d142561b843846761bdbbc753bb05e43d57293047641c1be3b61bb2e48718ddf430ea0aaff9ab1f4cfd517245f80501b4d45e SHA512 2b1bcbfefbbb1b69f4bcf9d9de81ad81e504d02143183a96b3876db1cc5f686623b46df64765f33ee2924840b4f2c72230c855dc462fcbc9c65808a9df9a6ccc
+DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
+EBUILD sphinx-1.2.2-r1.ebuild 3040 BLAKE2B 5af217a4d36a92655fb24ccd494406dade680d35eed57a6af4d7c6fad48fe5f32ba8d24fa5e623da33e9563ee884ceed4b51bd8095fffe19c7b6fa3c767eb773 SHA512 59f48940ec04e78480bfbb8ef4321b37f83652299b641253d421a36c533f26f88875ff8df412923158e25aa5d4035617681891de4f2b53d29255c2dddc6405fe
+EBUILD sphinx-1.2.3-r1.ebuild 3102 BLAKE2B a72b21e1415f0f99974e3a0f2839c22e6d240eccfb2ebbd87324c8c0aa54000fe416857a8a67c8a1a2a8c17c185d20d1d9357c264028f19e854a86376a603c0c SHA512 58125f60c80fafcffeb2d19148fe4ec48feac2cf1294e876d7b9d90a0274924419f3b9aebe46ce712594fa393a2426e6505059122519878772ab65581dad18e2
+EBUILD sphinx-1.7.5-r1.ebuild 3298 BLAKE2B f50b0ee5bdc3d26c59692c4a8bafd4a5b406c6edd0ec1bdb799492b38e9c45840aeec391e8a46525b946026018a9e3b7487b08698116cd8fb98b669fdd277466 SHA512 a33173c0af8033d8d3f241330f304926b74d0e61f4fe6c885d92e23206968e7e18f3aefb045f9fbbf087b94d8e5388c982a8ab67db5f103b7acff20aa51acc83
+EBUILD sphinx-2.0.1.ebuild 3492 BLAKE2B 410a3091c602875438b23e393b4571d3d762907e7a715111c0d64425c2d68097d02f9a241da0fb19d9cff670e2d68ce0d52846cce7272db1418f1ef63e5ac5ba SHA512 8fb8b1e828658d4cd7de7b7037abb3a49638882cb1fcd51eff6cf1a36a5878af3baf089c2398e56fae18a899c58e2c9a82103a2fda0d65d14f07332de6840ca1
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
index d23a387e8cbb..2882d663577d 100644
--- a/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils versionator
diff --git a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
index 225e80dc9d88..63887bb87b92 100644
--- a/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.2.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 eutils versionator
diff --git a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
index 12f6fcda60b4..fabdfad0b791 100644
--- a/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy{,3} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/sphinx/sphinx-2.0.0.ebuild b/dev-python/sphinx/sphinx-2.0.0.ebuild
deleted file mode 100644
index 779ccc6065cf..000000000000
--- a/dev-python/sphinx/sphinx-2.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="http://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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-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-2.0.1.ebuild b/dev-python/sphinx/sphinx-2.0.1.ebuild
new file mode 100644
index 000000000000..bf0e1fd1b845
--- /dev/null
+++ b/dev-python/sphinx/sphinx-2.0.1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~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/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+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}"
+}
-- 
cgit v1.2.3