From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BFEE4138334 for ; Mon, 25 Nov 2019 12:35:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C4AEE0A5D; Mon, 25 Nov 2019 12:35:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AD49E0A5D for ; Mon, 25 Nov 2019 12:35:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6707734D391 for ; Mon, 25 Nov 2019 12:35:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A62678C8 for ; Mon, 25 Nov 2019 12:35:30 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1574685308.dd6667c7b933e73412255796dbadbc7a5de3413a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/importlib_metadata/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild X-VCS-Directories: dev-python/importlib_metadata/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: dd6667c7b933e73412255796dbadbc7a5de3413a X-VCS-Branch: master Date: Mon, 25 Nov 2019 12:35:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 35dd432f-71f0-444b-bee8-c79b091c7338 X-Archives-Hash: 9c929b2d5eec34394086133acae5130f commit: dd6667c7b933e73412255796dbadbc7a5de3413a Author: Michał Górny gentoo org> AuthorDate: Mon Nov 25 12:24:59 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 25 12:35:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd6667c7 dev-python/importlib_metadata: Use distutils_enable_sphinx Signed-off-by: Michał Górny gentoo.org> .../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 9c6d5ccab1d..85100202b3a 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 -}