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 3B620138334 for ; Sun, 24 Nov 2019 19:31:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2BE77E085D; Sun, 24 Nov 2019 19:31:57 +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 0EAC9E085D for ; Sun, 24 Nov 2019 19:31:57 +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 074A634D2D4 for ; Sun, 24 Nov 2019 19:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 84A098BE for ; Sun, 24 Nov 2019 19:31:52 +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: <1574623906.ca48b950b2818933a85ff55aabf1e115ce38b2ee.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: ca48b950b2818933a85ff55aabf1e115ce38b2ee X-VCS-Branch: master Date: Sun, 24 Nov 2019 19:31:52 +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: 796670f5-69f7-451f-abab-5218cf11e057 X-Archives-Hash: 5b339d72be51ad724271296100013959 commit: ca48b950b2818933a85ff55aabf1e115ce38b2ee Author: Michał Górny gentoo org> AuthorDate: Sun Nov 24 19:17:41 2019 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Nov 24 19:31:46 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca48b950 dev-python/pillow: Enable py3.8 Signed-off-by: Michał Górny gentoo.org> dev-python/pillow/pillow-6.2.1.ebuild | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild index dbe4d52efc2..0ab2053bdfb 100644 --- a/dev-python/pillow/pillow-6.2.1.ebuild +++ b/dev-python/pillow/pillow-6.2.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) +PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} pypy ) PYTHON_REQ_USE='tk?,threads(+)' inherit distutils-r1 toolchain-funcs virtualx @@ -14,6 +14,7 @@ MY_P=${MY_PN}-${PV} DESCRIPTION="Python Imaging Library (fork)" HOMEPAGE="https://python-pillow.org/" SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="HPND" SLOT="0" @@ -35,8 +36,10 @@ RDEPEND=" DEPEND="${RDEPEND} dev-python/setuptools[${PYTHON_USEDEP}] doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + $(python_gen_any_dep ' + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] + ') ) test? ( dev-python/pytest[${PYTHON_USEDEP}] @@ -44,7 +47,11 @@ DEPEND="${RDEPEND} ) " -S="${WORKDIR}/${MY_P}" +python_check_deps() { + use doc || return 0 + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && + has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]" +} python_configure_all() { # It's important that these flags are also passed during the install phase @@ -84,7 +91,7 @@ src_test() { } python_test() { - "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" + "${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}" }