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 AABFD138334 for ; Mon, 25 Nov 2019 12:35:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 480CDE0A6A; Mon, 25 Nov 2019 12:35:37 +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 46C97E0A6A for ; Mon, 25 Nov 2019 12:35:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4843534D396 for ; Mon, 25 Nov 2019 12:35:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24DD78D0 for ; Mon, 25 Nov 2019 12:35:31 +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: <1574685313.de03ff1819be81c160fb0c2126317dfd9a6639a7.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pillow/pillow-6.2.1.ebuild X-VCS-Directories: dev-python/pillow/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: de03ff1819be81c160fb0c2126317dfd9a6639a7 X-VCS-Branch: master Date: Mon, 25 Nov 2019 12:35:31 +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: dd022e6f-3325-4c3d-b272-51d870517548 X-Archives-Hash: 6abb07041ab2a05ab9796e25ecbb53c5 commit: de03ff1819be81c160fb0c2126317dfd9a6639a7 Author: Michał Górny gentoo org> AuthorDate: Mon Nov 25 12:25:11 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 25 12:35:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de03ff18 dev-python/pillow: Use distutils_enable_sphinx Signed-off-by: Michał Górny gentoo.org> dev-python/pillow/pillow-6.2.1.ebuild | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild index 0ab2053bdfb..b799abf97ae 100644 --- a/dev-python/pillow/pillow-6.2.1.ebuild +++ b/dev-python/pillow/pillow-6.2.1.ebuild @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" +IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" RESTRICT="!test? ( test )" @@ -35,23 +35,14 @@ RDEPEND=" zlib? ( sys-libs/zlib:0= )" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] - doc? ( - $(python_gen_any_dep ' - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ') - ) test? ( dev-python/pytest[${PYTHON_USEDEP}] media-gfx/imagemagick[png] ) " -python_check_deps() { - use doc || return 0 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" -} +distutils_enable_sphinx docs \ + dev-python/sphinx_rtd_theme python_configure_all() { # It's important that these flags are also passed during the install phase @@ -82,10 +73,6 @@ python_configure_all() { tc-export PKG_CONFIG } -python_compile_all() { - use doc && emake -C docs html -} - src_test() { virtx distutils-r1_src_test } @@ -102,7 +89,6 @@ python_install() { } python_install_all() { - use doc && local HTML_DOCS=( docs/_build/html/. ) if use examples ; then docinto example dodoc docs/example/*