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 CB7B5138334 for ; Wed, 20 Nov 2019 14:23:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC1D2E08B1; Wed, 20 Nov 2019 14:22:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 48098E08A8 for ; Wed, 20 Nov 2019 14:22:28 +0000 (UTC) Received: from localhost.localdomain (c134-66.icpnet.pl [85.221.134.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: mgorny) by smtp.gentoo.org (Postfix) with ESMTPSA id 930EA34D138; Wed, 20 Nov 2019 14:22:26 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: python@gentoo.org, =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 3/4] dev-python/future: Use distutils_enable_sphinx Date: Wed, 20 Nov 2019 15:21:57 +0100 Message-Id: <20191120142158.157436-3-mgorny@gentoo.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191120142158.157436-1-mgorny@gentoo.org> References: <20191120142158.157436-1-mgorny@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 72b89753-c249-4925-a055-5e45c9f6ee70 X-Archives-Hash: 7979702d780a6fc13249cfd541e5c3ec 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.24.0