From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1125267-garchives=archives.gentoo.org@lists.gentoo.org>
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 B4D18138334
	for <garchives@archives.gentoo.org>; Mon, 25 Nov 2019 12:35:43 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 0515CE0A7D;
	Mon, 25 Nov 2019 12:35:39 +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 E2343E0A7D
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2019 12:35:38 +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 4E4B634D34A
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2019 12:35:36 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B910E8D8
	for <gentoo-commits@lists.gentoo.org>; Mon, 25 Nov 2019 12:35:31 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
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" <mgorny@gentoo.org>
Message-ID: <1574685321.a53294c6e44cf07e9102b4b3f4afea56ecd3c11f.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/webtest/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-python/webtest/webtest-2.0.33.ebuild
X-VCS-Directories: dev-python/webtest/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: a53294c6e44cf07e9102b4b3f4afea56ecd3c11f
X-VCS-Branch: master
Date: Mon, 25 Nov 2019 12:35:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 559fb9b4-b6ca-4efb-9aee-e450f9da28a8
X-Archives-Hash: 1669e73d96b5219cdf7d39074e0570d3

commit:     a53294c6e44cf07e9102b4b3f4afea56ecd3c11f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 12:25:27 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 12:35:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a53294c6

dev-python/webtest: Use distutils_enable_sphinx

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/webtest/webtest-2.0.33.ebuild | 35 ++++----------------------------
 1 file changed, 4 insertions(+), 31 deletions(-)

diff --git a/dev-python/webtest/webtest-2.0.33.ebuild b/dev-python/webtest/webtest-2.0.33.ebuild
index 192dfb7318f..c9df5a13b44 100644
--- a/dev-python/webtest/webtest-2.0.33.ebuild
+++ b/dev-python/webtest/webtest-2.0.33.ebuild
@@ -13,11 +13,13 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Helper to test WSGI applications"
 HOMEPAGE="https://pypi.org/project/WebTest/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="doc test"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 # nose<1.3.0 appears a leftover never updated in requires.txt. tests pass fine with latest
 RDEPEND="
@@ -28,10 +30,6 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( $(python_gen_any_dep '
-			dev-python/sphinx[${PYTHON_USEDEP}]
-		')
-	)
 	test? ( dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/pyquery[${PYTHON_USEDEP}]
 		dev-python/pastedeploy[${PYTHON_USEDEP}]
@@ -40,31 +38,11 @@ DEPEND="${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 )
 	)"
 
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="!test? ( test )"
-
 PATCHES=(
 	"${FILESDIR}/webtest-2.0.33-no-pylons-theme.patch"
 )
 
-python_check_deps() {
-	use doc || return 0
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-python_prepare_all() {
-	# Prevent un-needed d'loading during doc build
-	sed -i -e 's:^intersphinx_mapping:disabled_&: ; s:^templates_path:#&:' \
-		docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs html || die
-	fi
-}
+distutils_enable_sphinx docs
 
 python_test() {
 	distutils_install_for_testing
@@ -72,8 +50,3 @@ python_test() {
 	local -x PYTHONPATH=
 	nosetests -v || die "Tests fail with ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( html/. )
-	distutils-r1_python_install_all
-}