From f7595ec5e0419cc5f2373a3395e5182baa9f7320 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 25 Nov 2019 13:25:05 +0100 Subject: [PATCH] dev-python/jaraco-packaging: Use distutils_enable_sphinx MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../jaraco-packaging-6.2-r1.ebuild | 30 ++++--------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild index e3e5f83ada4f..79852d7bffa4 100644 --- a/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild +++ b/dev-python/jaraco-packaging/jaraco-packaging-6.2-r1.ebuild @@ -11,11 +11,13 @@ MY_PN="${PN/-/.}" DESCRIPTION="Tools to supplement packaging Python releases" HOMEPAGE="https://github.com/jaraco/jaraco.packaging" SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz" +S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="MIT" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" +RESTRICT="!test? ( test )" RDEPEND=" dev-python/importlib_metadata[${PYTHON_USEDEP}] @@ -24,28 +26,14 @@ RDEPEND=" " DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - ') - ) test? ( ${RDEPEND} >=dev-python/pytest-2.8[${PYTHON_USEDEP}] ) " -RESTRICT="!test? ( test )" - -S="${WORKDIR}/${MY_PN}-${PV}" - -python_check_deps() { - use doc || return 0 - - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + ">=dev-python/rst-linker-1.9" python_prepare_all() { # avoid a setuptools_scm dependency @@ -56,14 +44,6 @@ python_prepare_all() { distutils-r1_python_prepare_all } -python_compile_all() { - if use doc; then - cd docs || die - sphinx-build . _build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} - python_test() { # Skip one test which requires network access # Override pytest options to skip flake8 -- 2.26.2