From 70f0e07490488e49535156b583077d2867299401 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Wed, 20 Nov 2019 15:21:36 +0100 Subject: [PATCH] dev-python/future: Use distutils_enable_sphinx MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/future/future-0.18.2.ebuild | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/dev-python/future/future-0.18.2.ebuild b/dev-python/future/future-0.18.2.ebuild index d5b55ddea8d2..91b1a6a29af8 100644 --- a/dev-python/future/future-0.18.2.ebuild +++ b/dev-python/future/future-0.18.2.ebuild @@ -17,16 +17,12 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~ IUSE="doc" distutils_enable_tests pytest +distutils_enable_sphinx docs \ + dev-python/sphinx-bootstrap-theme # TODO: make numpy unconditional when it supports py3.8 -BDEPEND=" +BDEPEND+=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}] - ') - ) test? ( $(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \ python{2_7,3_{5,6,7}}) @@ -37,12 +33,6 @@ PATCHES=( "${FILESDIR}"/${P}-tests.patch ) -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx-bootstrap-theme[${PYTHON_USEDEP}]" -} - python_prepare_all() { sed -i "/'sphinx.ext.intersphinx'/d" docs/conf.py || die # tests requiring network access @@ -52,10 +42,3 @@ python_prepare_all() { distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sphinx-build docs/ docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} -- 2.26.2