1 |
commit: 758e6ebc05309b6e77209d1be64577da49e917ac |
2 |
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 22 16:52:34 2017 +0000 |
4 |
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 22 16:53:50 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=758e6ebc |
7 |
|
8 |
dev-python/pillow: jpeg dependency is unconditional #632418 |
9 |
|
10 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
11 |
|
12 |
dev-python/pillow/metadata.xml | 1 - |
13 |
...llow-4.2.1-r1.ebuild => pillow-4.2.1-r2.ebuild} | 9 ++- |
14 |
dev-python/pillow/pillow-4.2.1.ebuild | 83 ---------------------- |
15 |
3 files changed, 4 insertions(+), 89 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/pillow/metadata.xml b/dev-python/pillow/metadata.xml |
18 |
index d641c40047b..c3f74b98266 100644 |
19 |
--- a/dev-python/pillow/metadata.xml |
20 |
+++ b/dev-python/pillow/metadata.xml |
21 |
@@ -6,7 +6,6 @@ |
22 |
<name>Python</name> |
23 |
</maintainer> |
24 |
<use> |
25 |
- <flag name="ole">Add support for OLE2 image format</flag> |
26 |
<flag name="imagequant">Build with Image Quantization Library support</flag> |
27 |
</use> |
28 |
<upstream> |
29 |
|
30 |
diff --git a/dev-python/pillow/pillow-4.2.1-r1.ebuild b/dev-python/pillow/pillow-4.2.1-r2.ebuild |
31 |
similarity index 89% |
32 |
rename from dev-python/pillow/pillow-4.2.1-r1.ebuild |
33 |
rename to dev-python/pillow/pillow-4.2.1-r2.ebuild |
34 |
index 1621cc8edf3..785dfedc3b9 100644 |
35 |
--- a/dev-python/pillow/pillow-4.2.1-r1.ebuild |
36 |
+++ b/dev-python/pillow/pillow-4.2.1-r2.ebuild |
37 |
@@ -18,17 +18,17 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
38 |
LICENSE="HPND" |
39 |
SLOT="0" |
40 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
41 |
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" |
42 |
+IUSE="doc examples imagequant jpeg2k lcms test tiff tk truetype webp zlib" |
43 |
|
44 |
-REQUIRED_USE="test? ( jpeg tiff )" |
45 |
+REQUIRED_USE="test? ( tiff )" |
46 |
|
47 |
RDEPEND=" |
48 |
dev-python/olefile[${PYTHON_USEDEP}] |
49 |
imagequant? ( media-gfx/libimagequant:0 ) |
50 |
- jpeg? ( virtual/jpeg:0 ) |
51 |
+ virtual/jpeg:0 |
52 |
jpeg2k? ( media-libs/openjpeg:2= ) |
53 |
lcms? ( media-libs/lcms:2= ) |
54 |
- tiff? ( media-libs/tiff:0=[jpeg?] ) |
55 |
+ tiff? ( media-libs/tiff:0=[jpeg] ) |
56 |
truetype? ( media-libs/freetype:2= ) |
57 |
webp? ( media-libs/libwebp:0= ) |
58 |
zlib? ( sys-libs/zlib:0= )" |
59 |
@@ -48,7 +48,6 @@ src_compile() { |
60 |
distutils-r1_src_compile \ |
61 |
--disable-raqm \ |
62 |
$(use_enable truetype freetype) \ |
63 |
- $(use_enable jpeg) \ |
64 |
$(use_enable jpeg2k jpeg2000) \ |
65 |
$(use_enable lcms) \ |
66 |
$(use_enable tiff) \ |
67 |
|
68 |
diff --git a/dev-python/pillow/pillow-4.2.1.ebuild b/dev-python/pillow/pillow-4.2.1.ebuild |
69 |
deleted file mode 100644 |
70 |
index a22b7b1fd8b..00000000000 |
71 |
--- a/dev-python/pillow/pillow-4.2.1.ebuild |
72 |
+++ /dev/null |
73 |
@@ -1,83 +0,0 @@ |
74 |
-# Copyright 1999-2017 Gentoo Foundation |
75 |
-# Distributed under the terms of the GNU General Public License v2 |
76 |
- |
77 |
-EAPI=6 |
78 |
- |
79 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
80 |
-PYTHON_REQ_USE='tk?,threads(+)' |
81 |
- |
82 |
-inherit distutils-r1 eutils virtualx |
83 |
- |
84 |
-MY_PN=Pillow |
85 |
-MY_P=${MY_PN}-${PV} |
86 |
- |
87 |
-DESCRIPTION="Python Imaging Library (fork)" |
88 |
-HOMEPAGE="https://python-pillow.org/" |
89 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
90 |
- |
91 |
-LICENSE="HPND" |
92 |
-SLOT="0" |
93 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
94 |
-IUSE="doc examples imagequant jpeg jpeg2k ole lcms test tiff tk truetype webp zlib" |
95 |
- |
96 |
-REQUIRED_USE="test? ( jpeg tiff )" |
97 |
- |
98 |
-RDEPEND=" |
99 |
- imagequant? ( media-gfx/libimagequant:0 ) |
100 |
- jpeg? ( virtual/jpeg:0 ) |
101 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
102 |
- lcms? ( media-libs/lcms:2= ) |
103 |
- ole? ( dev-python/olefile[${PYTHON_USEDEP}] ) |
104 |
- tiff? ( media-libs/tiff:0=[jpeg?] ) |
105 |
- truetype? ( media-libs/freetype:2= ) |
106 |
- webp? ( media-libs/libwebp:0= ) |
107 |
- zlib? ( sys-libs/zlib:0= )" |
108 |
-DEPEND="${RDEPEND} |
109 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
110 |
- doc? ( |
111 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
112 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
113 |
- ) |
114 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] ) |
115 |
-" |
116 |
- |
117 |
-S="${WORKDIR}/${MY_P}" |
118 |
- |
119 |
-src_compile() { |
120 |
- # raqm not in portage yet |
121 |
- distutils-r1_src_compile \ |
122 |
- --disable-raqm \ |
123 |
- $(use_enable truetype freetype) \ |
124 |
- $(use_enable jpeg) \ |
125 |
- $(use_enable jpeg2k jpeg2000) \ |
126 |
- $(use_enable lcms) \ |
127 |
- $(use_enable tiff) \ |
128 |
- $(use_enable imagequant) \ |
129 |
- $(use_enable webp) \ |
130 |
- $(use_enable webp webpmux) \ |
131 |
- $(use_enable zlib) |
132 |
-} |
133 |
- |
134 |
-python_compile_all() { |
135 |
- use doc && emake -C docs html |
136 |
-} |
137 |
- |
138 |
-python_test() { |
139 |
- "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" |
140 |
- virtx nosetests -vx Tests/test_*.py |
141 |
-} |
142 |
- |
143 |
-python_install() { |
144 |
- python_doheader libImaging/*.h |
145 |
- distutils-r1_python_install |
146 |
-} |
147 |
- |
148 |
-python_install_all() { |
149 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
150 |
- if use examples ; then |
151 |
- docinto examples |
152 |
- dodoc Scripts/* |
153 |
- docompress -x /usr/share/doc/${PF}/examples |
154 |
- fi |
155 |
- distutils-r1_python_install_all |
156 |
-} |