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 8655E138334 for ; Mon, 25 Nov 2019 12:35:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AD7AE0A4F; Mon, 25 Nov 2019 12:35:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 F190DE0A49 for ; Mon, 25 Nov 2019 12:35:34 +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 D4D4D34D383 for ; Mon, 25 Nov 2019 12:35:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C9DB8C5 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: <1574685305.97e0420ad66d0705edd16616dafa2654f9ec79cb.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/flask/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/flask/flask-1.1.1.ebuild dev-python/flask/flask-9999.ebuild X-VCS-Directories: dev-python/flask/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 97e0420ad66d0705edd16616dafa2654f9ec79cb 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: ddab9ac6-5303-404e-9e34-52961cd1ddb2 X-Archives-Hash: 0aa38fbfc111ab9f5c7b250d68f73428 commit: 97e0420ad66d0705edd16616dafa2654f9ec79cb Author: Michał Górny gentoo org> AuthorDate: Mon Nov 25 12:24:52 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 25 12:35:05 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e0420a dev-python/flask: Use distutils_enable_sphinx Signed-off-by: Michał Górny gentoo.org> dev-python/flask/flask-1.1.1.ebuild | 19 ++----------------- dev-python/flask/flask-9999.ebuild | 21 +++------------------ 2 files changed, 5 insertions(+), 35 deletions(-) diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild index df477802402..3cfa9366453 100644 --- a/dev-python/flask/flask-1.1.1.ebuild +++ b/dev-python/flask/flask-1.1.1.ebuild @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0" -IUSE="doc examples test" +IUSE="examples test" RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] @@ -32,7 +32,6 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" PATCHES=( @@ -40,20 +39,7 @@ PATCHES=( "${FILESDIR}/flask-1.1.1-py38.patch" ) -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} +distutils_enable_sphinx docs python_test() { PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ @@ -62,7 +48,6 @@ python_test() { python_install_all() { use examples && dodoc -r examples - use doc && HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all } diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild index 6c634728d16..ab417690d6f 100644 --- a/dev-python/flask/flask-9999.ebuild +++ b/dev-python/flask/flask-9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy{,3} ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy{,3} ) inherit distutils-r1 @@ -22,7 +22,7 @@ fi LICENSE="BSD" SLOT="0" -IUSE="doc examples test" +IUSE="examples test" RESTRICT="!test? ( test )" RDEPEND="dev-python/click[${PYTHON_USEDEP}] @@ -32,23 +32,9 @@ RDEPEND="dev-python/click[${PYTHON_USEDEP}] >=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') ) test? ( dev-python/pytest[${PYTHON_USEDEP}] )" -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" -} - -python_prepare_all() { - # Prevent un-needed d'loading - sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die - distutils-r1_python_prepare_all -} - -python_compile_all() { - use doc && emake -C docs html -} +distutils_enable_sphinx docs python_test() { PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \ @@ -57,7 +43,6 @@ python_test() { python_install_all() { use examples && dodoc -r examples - use doc && HTML_DOCS=( docs/_build/html/. ) distutils-r1_python_install_all }