From dd6667c7b933e73412255796dbadbc7a5de3413a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 25 Nov 2019 13:24:59 +0100 Subject: [PATCH] dev-python/importlib_metadata: Use distutils_enable_sphinx MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- .../importlib_metadata-0.23-r1.ebuild | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild index 9c6d5ccab1dc..85100202b3a1 100644 --- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild +++ b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="doc test" +IUSE="test" RDEPEND=" dev-python/zipp[${PYTHON_USEDEP}] @@ -29,29 +29,17 @@ BDEPEND=" $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}}) dev-python/packaging[${PYTHON_USEDEP}] ) - doc? ( - $(python_gen_any_dep '>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]') - $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') - ) " PATCHES=( "${FILESDIR}/importlib_metadata-0.23-py38.patch" ) +distutils_enable_sphinx "${PN}/docs" \ + '>=dev-python/rst-linker-1.9' distutils_enable_tests unittest -python_check_deps() { - if use doc; then - has_version ">=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]" || return ${?} - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" || return ${?} - fi - return 0 -} - python_prepare_all() { - sed -i "/'sphinx.ext.intersphinx'/d" ${PN}/docs/conf.py || die - # avoid a setuptools_scm dependency sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \ @@ -59,10 +47,3 @@ python_prepare_all() { distutils-r1_python_prepare_all } - -python_compile_all() { - if use doc; then - sphinx-build ${PN}/docs docs/_build/html || die - HTML_DOCS=( docs/_build/html/. ) - fi -} -- 2.26.2