1 |
commit: 53929708a6f9c829d15bc4d24a3850758ed9619b |
2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 5 11:57:56 2019 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 5 11:57:56 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53929708 |
7 |
|
8 |
dev-python/pillow: remove old |
9 |
|
10 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.66, Repoman-2.3.11 |
12 |
|
13 |
dev-python/pillow/Manifest | 1 - |
14 |
.../pillow/files/pillow-5.2.0-fix-lib-paths.patch | 16 ---- |
15 |
dev-python/pillow/pillow-5.2.0.ebuild | 103 --------------------- |
16 |
3 files changed, 120 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest |
19 |
index 8ba4bd6a56c..7cabdc3d863 100644 |
20 |
--- a/dev-python/pillow/Manifest |
21 |
+++ b/dev-python/pillow/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 |
24 |
-DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c |
25 |
DIST pillow-5.4.1.tar.gz 15799745 BLAKE2B d9e3851a80a1f94d7292852b9ab806d9a26870795f499bb109a440e64c07112055a4cd382688b977f3c3ae76ed3d6fd38460afff594f964338afa668d288e4de SHA512 20b75ab50df7e9545c76d66ad585922d1f86fbcf8df9d2566882ab8929c3122573b9ec622766523ec46f5e7a98740cc78ff192e3e8f08ab0b77a7f2b033a7f62 |
26 |
DIST pillow-6.0.0.tar.gz 29205509 BLAKE2B 83e2d1abeea468b7bf344ea5003940b14d6c69649e02a954c0b3810fc5d77288c361fb40747171176d29843848d802b783a2b0c0de15476462f17f15552298fa SHA512 c5fbe1432d576fe4a70a15fa7a70a446ccbcb247fbd4c3605917fa26a6345eb9319c0153dba7637d521c358963f2f06f525219aa1af1502da2565d54dceef4c5 |
27 |
|
28 |
diff --git a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch b/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch |
29 |
deleted file mode 100644 |
30 |
index b73681831a6..00000000000 |
31 |
--- a/dev-python/pillow/files/pillow-5.2.0-fix-lib-paths.patch |
32 |
+++ /dev/null |
33 |
@@ -1,16 +0,0 @@ |
34 |
-diff --git a/setup.py b/setup.py |
35 |
-index 761d552c..c4a55092 100755 |
36 |
---- a/setup.py |
37 |
-+++ b/setup.py |
38 |
-@@ -435,6 +435,11 @@ class pil_build_ext(build_ext): |
39 |
- _add_directory(include_dirs, |
40 |
- os.path.join(best_path, 'include')) |
41 |
- |
42 |
-+ # The logic above fails in many cases (such as pypy builds) and we fix |
43 |
-+ # it here by making sure we look in standard places first. |
44 |
-+ library_dirs = ['/usr/lib64', '/usr/lib'] + library_dirs |
45 |
-+ include_dirs = ['/usr/include'] + include_dirs |
46 |
-+ |
47 |
- # |
48 |
- # insert new dirs *before* default libs, to avoid conflicts |
49 |
- # between Python PYD stub libs and real libraries |
50 |
|
51 |
diff --git a/dev-python/pillow/pillow-5.2.0.ebuild b/dev-python/pillow/pillow-5.2.0.ebuild |
52 |
deleted file mode 100644 |
53 |
index 3eb0933a358..00000000000 |
54 |
--- a/dev-python/pillow/pillow-5.2.0.ebuild |
55 |
+++ /dev/null |
56 |
@@ -1,103 +0,0 @@ |
57 |
-# Copyright 1999-2019 Gentoo Authors |
58 |
-# Distributed under the terms of the GNU General Public License v2 |
59 |
- |
60 |
-EAPI=7 |
61 |
- |
62 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} pypy ) |
63 |
-PYTHON_REQ_USE='tk?,threads(+)' |
64 |
- |
65 |
-inherit distutils-r1 virtualx |
66 |
- |
67 |
-MY_PN=Pillow |
68 |
-MY_P=${MY_PN}-${PV} |
69 |
- |
70 |
-DESCRIPTION="Python Imaging Library (fork)" |
71 |
-HOMEPAGE="https://python-pillow.org/" |
72 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
73 |
- |
74 |
-LICENSE="HPND" |
75 |
-SLOT="0" |
76 |
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux" |
77 |
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" |
78 |
- |
79 |
-REQUIRED_USE="test? ( jpeg tiff )" |
80 |
- |
81 |
-RDEPEND=" |
82 |
- dev-python/olefile[${PYTHON_USEDEP}] |
83 |
- imagequant? ( media-gfx/libimagequant:0 ) |
84 |
- jpeg? ( virtual/jpeg:0 ) |
85 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
86 |
- lcms? ( media-libs/lcms:2= ) |
87 |
- tiff? ( media-libs/tiff:0=[jpeg,zlib] ) |
88 |
- truetype? ( media-libs/freetype:2= ) |
89 |
- webp? ( media-libs/libwebp:0= ) |
90 |
- zlib? ( sys-libs/zlib:0= )" |
91 |
-DEPEND="${RDEPEND} |
92 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
93 |
- doc? ( |
94 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
95 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
96 |
- ) |
97 |
- test? ( |
98 |
- <dev-python/pytest-3.10[${PYTHON_USEDEP}] |
99 |
- media-gfx/imagemagick[png] |
100 |
- ) |
101 |
-" |
102 |
- |
103 |
-S="${WORKDIR}/${MY_P}" |
104 |
- |
105 |
-PATCHES=( |
106 |
- "${FILESDIR}/${PN}-5.2.0-fix-lib-paths.patch" |
107 |
-) |
108 |
- |
109 |
-python_configure_all() { |
110 |
- # It's important that these flags are also passed during the install phase |
111 |
- # as well. Make sure of that if you change the lines below. See bug 661308. |
112 |
- mydistutilsargs=( |
113 |
- build_ext |
114 |
- --disable-platform-guessing |
115 |
- $(use_enable truetype freetype) |
116 |
- $(use_enable jpeg) |
117 |
- $(use_enable jpeg2k jpeg2000) |
118 |
- $(use_enable lcms) |
119 |
- $(use_enable tiff) |
120 |
- $(use_enable imagequant) |
121 |
- $(use_enable webp) |
122 |
- $(use_enable webp webpmux) |
123 |
- $(use_enable zlib) |
124 |
- ) |
125 |
-} |
126 |
- |
127 |
-python_compile() { |
128 |
- # Pillow monkeypatches distutils to achieve parallel compilation. This |
129 |
- # conflicts with distutils' builtin parallel computation (since py35) |
130 |
- # and make builds hang. To avoid that, we set MAX_CONCURRENCY=1 to |
131 |
- # disable monkeypatching. Can be removed when/if |
132 |
- # https://github.com/python-pillow/Pillow/pull/3272 is merged. |
133 |
- MAX_CONCURRENCY=1 distutils-r1_python_compile |
134 |
-} |
135 |
- |
136 |
-python_compile_all() { |
137 |
- use doc && emake -C docs html |
138 |
-} |
139 |
- |
140 |
-python_test() { |
141 |
- "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" |
142 |
- # no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed |
143 |
- virtx pytest -vx Tests/test_*.py -p no:relaxed |
144 |
-} |
145 |
- |
146 |
-python_install() { |
147 |
- python_doheader src/libImaging/*.h |
148 |
- distutils-r1_python_install |
149 |
-} |
150 |
- |
151 |
-python_install_all() { |
152 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
153 |
- if use examples ; then |
154 |
- docinto example |
155 |
- dodoc docs/example/* |
156 |
- docompress -x /usr/share/doc/${PF}/example |
157 |
- fi |
158 |
- distutils-r1_python_install_all |
159 |
-} |