gentoo resync : 24.02.2018

3 files changed, 121 insertions, 2 deletions

diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 9268fa7252f2..bdcf29768751 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -5,10 +5,12 @@ DIST Sphinx-1.3.1.tar.gz 3469782 BLAKE2B ae2fa602a7873e6ef735decc2dcdd5a2632b848
 DIST Sphinx-1.3.5.tar.gz 3679978 BLAKE2B 2a88859bfd4a3de75a7b56fce65086e1239c3c58730280df078b3f76d368028a124aa6d4ca65c40773efa4c1a83dd047ea0d647582057c63bf82dadb5f2549e9 SHA512 90eda9cdbd24575d9f763e5c35e176d9970d1c83dd06dd41e9137f5c6035738fd21c4c57ff98810fc8adf91fa625192e6534bf0bbf70e78cc98f73df59eaabbc
 DIST Sphinx-1.6.3.tar.gz 4674251 BLAKE2B ba13de3d72fbc5cbc3632a1062001ed287798efe5f04064d241b645d6e4c52c9d9c115aaae4ae7b94213bbddf595a93480788d66b3a54eac3c9fb415d007d4ca SHA512 d5aec58e19239db4e61fcd6b103fcc838d97aad5a7aaf9279ff1097791d9cd1ba245989307a2d1049c123058b84ca4e91db192a1672c040d80fafed3907736ae
 DIST Sphinx-1.6.5.tar.gz 4680974 BLAKE2B 97b0cff21985de071d29651824f2954ca4d12c5095fb8049597235c8071bccb00344e89fc4a90ca010fe79a76faf0e5ae2b09ed698f1c5bcfd8f06de64169107 SHA512 c6ba7ba639f9814867d9abaaac48d58daa9d0ea9ceae4495bdbd311856833314eade2d9df7213c0357d5eea53d525c5a1235bc977a07cc7ef82e1ff0ecb51f3d
+DIST Sphinx-1.6.7.tar.gz 4692169 BLAKE2B cde46b6e9dd2c39a592802e57becbb6f61e6d370ed08fdeb41270c8177818f48f68a6e03c174b8d70453ac6f936fa25a4c2bccbf9eb7e84a008027321db93209 SHA512 bc852d4694bf433a8a1d931bc67e4c8bf50789f833be8a338eb934325734b9fbc361c1d203ecd6e28f9c0dff5edb090556372d9403cc55d4972b18bdd4b7bfd4
 EBUILD sphinx-1.2.2-r1.ebuild 3048 BLAKE2B c99dbf2cecddf74cba0f091250d2bc0a517168225a2d1df9213475fdc9996286c03f4abcc668d51ee885b571b9baf830f9f76ab29816a357464fe12132f555de SHA512 ae2a68a69515191020e983ce10ce740d09d472e5bf665be6bff02c9ff959d7a9fe09a346b3b51afb3b360995d24eaa277f233e336d4e15aaf0bcd764bef1050d
 EBUILD sphinx-1.2.3-r1.ebuild 3110 BLAKE2B 29121955619c85d730603480ad19f92e5f17bcf76ff5830840f58136b4ca804e848a3266fc566799752bd09a3f25b096c88a243389ced75accb0ef4a3e92f258 SHA512 98a43b62068f49cdb1f8bc998836c2b65bc83a92ea0833a7971711ca4d5fef557d93d4e1d1d9b58757ca3567e2a65fbd35fe5a4409f3d5ec0d464ff0c106cf0a
 EBUILD sphinx-1.3.1-r2.ebuild 3466 BLAKE2B 760757384a5eaa95142b7013a5badffe9c7f729b49e0f2eefa1bf39c069bb8dd83ba9c96e7ade1c72991683d771bb068af46140c0c5135dfdbf6d41fad5ed403 SHA512 0705fa10d01ec6a215e25416d65c96e407f7230c33c1e2f81ab87f55f0a162bd6c3ceb6ad5bba343eaa3cf407f97d1b570b2f7dadcec0bce2f1870f03a739eb0
 EBUILD sphinx-1.3.5-r1.ebuild 3580 BLAKE2B ce19b68c70a1a739e31c3e9dda9afe612df66a8f98f77d8bbdc22a8682cf1c1bdc2374a0a42f6bb06fba437b9f4e9f75f5f15350c34df2ab3fd49f0f322b9288 SHA512 5d7a9b3e083b0f28e4774c5a51895cace0287cc581984ce5b8d4403670663b6bb79cffe1c0d516dcbf57fee8752e3723b1e18c80e5a495a7add224c2835957e9
 EBUILD sphinx-1.6.3-r3.ebuild 3422 BLAKE2B 8aca39ff63500a156c87677f94a205fcce22eb6e42a1a75db9cd994ec150165b34e40c85ec7eceec395916a7dffb932ac57833a4e4f196b6ddef35b48b6602ca SHA512 bfa29c4f9b17c4b2f18ad9c85d40d3f19dbdb974c5d056347ab992d476e16b9f685c9efe4060f2ff5d8547bc71a8321904984b9438c4b5250c76a98591c01343
-EBUILD sphinx-1.6.5.ebuild 3432 BLAKE2B da1662cfd6d3072378e9eece75c35a30cc81d4fcd45fca661802c21986734abf8e61b9870b9f57eb451a80a50f1abf1893ff86834eca9f98e060b003f26a8c34 SHA512 8d31055c016880e2cefec8be7bb19f77b6c9f8aa1dfcba20aa7354188191497e02e3829e54c49127c8c81e63b3791e69c67d2a97852c37c1cef3845e54b14a8e
+EBUILD sphinx-1.6.5.ebuild 3444 BLAKE2B 9d8bc4b31bb4d08f034ffe56ed1fc8cb95ebe6b61c51c852981ab99bd0eadfe4f33b6ce28e54defff96482b2c9fa474fbbf63843f4ea3506d8261f5c37ace6f5 SHA512 5e3d1bf7e990670c530992ae8c9b6fcae7604b2cf6ccbf8e713ef60f9c759f8d62d4b8961add93b1e91b48cdb026f9fd29f9004def4054156a77dc4cffb5e09f
+EBUILD sphinx-1.6.7.ebuild 3444 BLAKE2B 9d8bc4b31bb4d08f034ffe56ed1fc8cb95ebe6b61c51c852981ab99bd0eadfe4f33b6ce28e54defff96482b2c9fa474fbbf63843f4ea3506d8261f5c37ace6f5 SHA512 5e3d1bf7e990670c530992ae8c9b6fcae7604b2cf6ccbf8e713ef60f9c759f8d62d4b8961add93b1e91b48cdb026f9fd29f9004def4054156a77dc4cffb5e09f
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5.ebuild
index 782af85c275e..c152f62da5e7 100644
--- a/dev-python/sphinx/sphinx-1.6.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="doc latex net test"
 
 RDEPEND="
diff --git a/dev-python/sphinx/sphinx-1.6.7.ebuild b/dev-python/sphinx/sphinx-1.6.7.ebuild
new file mode 100644
index 000000000000..c152f62da5e7
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.6.7.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 eutils versionator
+
+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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc latex net test"
+
+RDEPEND="
+	>=dev-python/alabaster-0.7.9[${PYTHON_USEDEP}]
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.1.1[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1-r1[${PYTHON_USEDEP}]
+	dev-python/requests[${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/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+	dev-python/typing[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)
+	net? (
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-0.9[${PYTHON_USEDEP}]
+		>=dev-python/whoosh-2.0[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		virtual/python-enum34[${PYTHON_USEDEP}]
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.1-fix-pycode-grammar.patch
+)
+
+python_prepare_all() {
+	# remove tests that fail due to network-sandbox
+	rm tests/test_websupport.py || die "Failed to remove web tests"
+	rm tests/test_build_linkcheck.py || die "Failed to remove web tests"
+
+	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
+		emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
+		HTML_DOCS=( doc/_build/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+	cp -r -l tests "${BUILD_DIR}"/ || die "Failed to copy tests"
+	cp Makefile "${BUILD_DIR}"/ || die "Failed to copy Makefile"
+	emake test
+}
+
+pkg_postinst() {
+	replacing_python_eclass() {
+		local pv
+		for pv in ${REPLACING_VERSIONS}; do
+			if ! version_is_at_least 1.1.3-r4 ${pv}; then
+				return 0
+			fi
+		done
+
+		return 1
+	}
+
+	if replacing_python_eclass; then
+		ewarn "Replaced a very old sphinx version. If you are"
+		ewarn "experiencing problems, please re-emerge sphinx."
+	fi
+}