Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pillow/
Date: Mon, 25 Nov 2019 12:35:40
Message-Id: 1574685313.de03ff1819be81c160fb0c2126317dfd9a6639a7.mgorny@gentoo
1 commit: de03ff1819be81c160fb0c2126317dfd9a6639a7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 25 12:25:11 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 25 12:35:13 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de03ff18
7
8 dev-python/pillow: Use distutils_enable_sphinx
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pillow/pillow-6.2.1.ebuild | 20 +++-----------------
13 1 file changed, 3 insertions(+), 17 deletions(-)
14
15 diff --git a/dev-python/pillow/pillow-6.2.1.ebuild b/dev-python/pillow/pillow-6.2.1.ebuild
16 index 0ab2053bdfb..b799abf97ae 100644
17 --- a/dev-python/pillow/pillow-6.2.1.ebuild
18 +++ b/dev-python/pillow/pillow-6.2.1.ebuild
19 @@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
20 LICENSE="HPND"
21 SLOT="0"
22 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
23 -IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
24 +IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
25 REQUIRED_USE="test? ( jpeg tiff )"
26 RESTRICT="!test? ( test )"
27
28 @@ -35,23 +35,14 @@ RDEPEND="
29 zlib? ( sys-libs/zlib:0= )"
30 DEPEND="${RDEPEND}
31 dev-python/setuptools[${PYTHON_USEDEP}]
32 - doc? (
33 - $(python_gen_any_dep '
34 - dev-python/sphinx[${PYTHON_USEDEP}]
35 - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
36 - ')
37 - )
38 test? (
39 dev-python/pytest[${PYTHON_USEDEP}]
40 media-gfx/imagemagick[png]
41 )
42 "
43
44 -python_check_deps() {
45 - use doc || return 0
46 - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" &&
47 - has_version "dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]"
48 -}
49 +distutils_enable_sphinx docs \
50 + dev-python/sphinx_rtd_theme
51
52 python_configure_all() {
53 # It's important that these flags are also passed during the install phase
54 @@ -82,10 +73,6 @@ python_configure_all() {
55 tc-export PKG_CONFIG
56 }
57
58 -python_compile_all() {
59 - use doc && emake -C docs html
60 -}
61 -
62 src_test() {
63 virtx distutils-r1_src_test
64 }
65 @@ -102,7 +89,6 @@ python_install() {
66 }
67
68 python_install_all() {
69 - use doc && local HTML_DOCS=( docs/_build/html/. )
70 if use examples ; then
71 docinto example
72 dodoc docs/example/*