| 1 |
commit: 3f782b122d0ef16c14b25510dca3050acbd51c33 |
| 2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 1 18:45:00 2018 +0000 |
| 4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 1 18:45:56 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f782b12 |
| 7 |
|
| 8 |
dev-python/pillow: remove old |
| 9 |
|
| 10 |
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.50, Repoman-2.3.11 |
| 12 |
|
| 13 |
dev-python/pillow/Manifest | 1 - |
| 14 |
.../pillow-4.3.0-freetype2.9-test-metrics.patch | 12 --- |
| 15 |
dev-python/pillow/files/pillow-4.3.0-no-qt.patch | 30 ------ |
| 16 |
.../pillow/files/pillow-4.3.0-no-scripts.patch | 12 --- |
| 17 |
dev-python/pillow/pillow-4.3.0-r2.ebuild | 95 ------------------ |
| 18 |
dev-python/pillow/pillow-4.3.0-r3.ebuild | 106 --------------------- |
| 19 |
6 files changed, 256 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest |
| 22 |
index 39808e9ddae..550e53d9fe8 100644 |
| 23 |
--- a/dev-python/pillow/Manifest |
| 24 |
+++ b/dev-python/pillow/Manifest |
| 25 |
@@ -1,4 +1,3 @@ |
| 26 |
DIST Pillow-3.4.2.zip 11042238 BLAKE2B 334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39 SHA512 5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39 |
| 27 |
-DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7 SHA512 5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb |
| 28 |
DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B 7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb SHA512 2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c |
| 29 |
DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375 SHA512 0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab |
| 30 |
|
| 31 |
diff --git a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch b/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index 211ef7ac58d..00000000000 |
| 34 |
--- a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,12 +0,0 @@ |
| 37 |
---- a/Tests/test_imagefont.py |
| 38 |
-+++ b/Tests/test_imagefont.py |
| 39 |
-@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase): |
| 40 |
- ('2', '8'): {'multiline': 6.2, |
| 41 |
- 'textsize': 2.5, |
| 42 |
- 'getters': (12, 16)}, |
| 43 |
-+ ('2', '9'): {'multiline': 6.2, |
| 44 |
-+ 'textsize': 2.5, |
| 45 |
-+ 'getters': (12, 16)}, |
| 46 |
- 'Default': {'multiline': 0.5, |
| 47 |
- 'textsize': 0.5, |
| 48 |
- 'getters': (12, 16)}, |
| 49 |
|
| 50 |
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch b/dev-python/pillow/files/pillow-4.3.0-no-qt.patch |
| 51 |
deleted file mode 100644 |
| 52 |
index 231c605b834..00000000000 |
| 53 |
--- a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch |
| 54 |
+++ /dev/null |
| 55 |
@@ -1,30 +0,0 @@ |
| 56 |
-diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py |
| 57 |
-index 36b4e1eb..ddde2cd9 100644 |
| 58 |
---- a/PIL/ImageQt.py |
| 59 |
-+++ b/PIL/ImageQt.py |
| 60 |
-@@ -20,24 +20,7 @@ from . import Image |
| 61 |
- from ._util import isPath |
| 62 |
- from io import BytesIO |
| 63 |
- |
| 64 |
--qt_is_installed = True |
| 65 |
--qt_version = None |
| 66 |
--try: |
| 67 |
-- from PyQt5.QtGui import QImage, qRgba, QPixmap |
| 68 |
-- from PyQt5.QtCore import QBuffer, QIODevice |
| 69 |
-- qt_version = '5' |
| 70 |
--except (ImportError, RuntimeError): |
| 71 |
-- try: |
| 72 |
-- from PyQt4.QtGui import QImage, qRgba, QPixmap |
| 73 |
-- from PyQt4.QtCore import QBuffer, QIODevice |
| 74 |
-- qt_version = '4' |
| 75 |
-- except (ImportError, RuntimeError): |
| 76 |
-- try: |
| 77 |
-- from PySide.QtGui import QImage, qRgba, QPixmap |
| 78 |
-- from PySide.QtCore import QBuffer, QIODevice |
| 79 |
-- qt_version = 'side' |
| 80 |
-- except ImportError: |
| 81 |
-- qt_is_installed = False |
| 82 |
-+qt_is_installed = False |
| 83 |
- |
| 84 |
- |
| 85 |
- def rgb(r, g, b, a=255): |
| 86 |
|
| 87 |
diff --git a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch b/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch |
| 88 |
deleted file mode 100644 |
| 89 |
index c30b00d54d7..00000000000 |
| 90 |
--- a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,12 +0,0 @@ |
| 93 |
-https://bugs.gentoo.org/562682 |
| 94 |
- |
| 95 |
---- a/setup.py |
| 96 |
-+++ b/setup.py |
| 97 |
-@@ -779,7 +779,6 @@ try: |
| 98 |
- ext_modules=[Extension("PIL._imaging", ["_imaging.c"])], |
| 99 |
- include_package_data=True, |
| 100 |
- packages=find_packages(), |
| 101 |
-- scripts=glob.glob("Scripts/*.py"), |
| 102 |
- install_requires=['olefile'], |
| 103 |
- test_suite='nose.collector', |
| 104 |
- keywords=["Imaging", ], |
| 105 |
|
| 106 |
diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild b/dev-python/pillow/pillow-4.3.0-r2.ebuild |
| 107 |
deleted file mode 100644 |
| 108 |
index 25dddfce611..00000000000 |
| 109 |
--- a/dev-python/pillow/pillow-4.3.0-r2.ebuild |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,95 +0,0 @@ |
| 112 |
-# Copyright 1999-2018 Gentoo Foundation |
| 113 |
-# Distributed under the terms of the GNU General Public License v2 |
| 114 |
- |
| 115 |
-EAPI=6 |
| 116 |
- |
| 117 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 118 |
-PYTHON_REQ_USE='tk?,threads(+)' |
| 119 |
- |
| 120 |
-inherit distutils-r1 eutils virtualx |
| 121 |
- |
| 122 |
-MY_PN=Pillow |
| 123 |
-MY_P=${MY_PN}-${PV} |
| 124 |
- |
| 125 |
-DESCRIPTION="Python Imaging Library (fork)" |
| 126 |
-HOMEPAGE="https://python-pillow.org/" |
| 127 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
| 128 |
- |
| 129 |
-LICENSE="HPND" |
| 130 |
-SLOT="0" |
| 131 |
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" |
| 132 |
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib" |
| 133 |
- |
| 134 |
-REQUIRED_USE="test? ( jpeg tiff )" |
| 135 |
- |
| 136 |
-RDEPEND=" |
| 137 |
- dev-python/olefile[${PYTHON_USEDEP}] |
| 138 |
- imagequant? ( media-gfx/libimagequant:0 ) |
| 139 |
- jpeg? ( virtual/jpeg:0 ) |
| 140 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
| 141 |
- lcms? ( media-libs/lcms:2= ) |
| 142 |
- tiff? ( media-libs/tiff:0=[jpeg,zlib] ) |
| 143 |
- truetype? ( media-libs/freetype:2= ) |
| 144 |
- webp? ( media-libs/libwebp:0= ) |
| 145 |
- zlib? ( sys-libs/zlib:0= )" |
| 146 |
-DEPEND="${RDEPEND} |
| 147 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 148 |
- doc? ( |
| 149 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
| 150 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
| 151 |
- ) |
| 152 |
- test? ( |
| 153 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 154 |
- media-gfx/imagemagick[png] |
| 155 |
- ) |
| 156 |
-" |
| 157 |
- |
| 158 |
-S="${WORKDIR}/${MY_P}" |
| 159 |
- |
| 160 |
-PATCHES=( |
| 161 |
- "${FILESDIR}"/pillow-4.3.0-no-scripts.patch |
| 162 |
- # can be removed at v5, patch already uptream. See bug 593816. |
| 163 |
- "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch |
| 164 |
-) |
| 165 |
- |
| 166 |
-python_configure_all() { |
| 167 |
- # It's important that these flags are also passed during the install phase |
| 168 |
- # as well. Make sure of that if you change the lines below. See bug 661308. |
| 169 |
- mydistutilsargs=( |
| 170 |
- build_ext |
| 171 |
- --disable-platform-guessing |
| 172 |
- $(use_enable truetype freetype) |
| 173 |
- $(use_enable jpeg) |
| 174 |
- $(use_enable jpeg2k jpeg2000) |
| 175 |
- $(use_enable lcms) |
| 176 |
- $(use_enable tiff) |
| 177 |
- $(use_enable imagequant) |
| 178 |
- $(use_enable webp) |
| 179 |
- $(use_enable webp webpmux) |
| 180 |
- $(use_enable zlib) |
| 181 |
- ) |
| 182 |
-} |
| 183 |
- |
| 184 |
-python_compile_all() { |
| 185 |
- use doc && emake -C docs html |
| 186 |
-} |
| 187 |
- |
| 188 |
-python_test() { |
| 189 |
- "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" |
| 190 |
- virtx nosetests -vx Tests/test_*.py |
| 191 |
-} |
| 192 |
- |
| 193 |
-python_install() { |
| 194 |
- python_doheader libImaging/*.h |
| 195 |
- distutils-r1_python_install |
| 196 |
-} |
| 197 |
- |
| 198 |
-python_install_all() { |
| 199 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
| 200 |
- if use examples ; then |
| 201 |
- docinto examples |
| 202 |
- dodoc Scripts/* |
| 203 |
- docompress -x /usr/share/doc/${PF}/examples |
| 204 |
- fi |
| 205 |
- distutils-r1_python_install_all |
| 206 |
-} |
| 207 |
|
| 208 |
diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild b/dev-python/pillow/pillow-4.3.0-r3.ebuild |
| 209 |
deleted file mode 100644 |
| 210 |
index a799e79a1d3..00000000000 |
| 211 |
--- a/dev-python/pillow/pillow-4.3.0-r3.ebuild |
| 212 |
+++ /dev/null |
| 213 |
@@ -1,106 +0,0 @@ |
| 214 |
-# Copyright 1999-2018 Gentoo Foundation |
| 215 |
-# Distributed under the terms of the GNU General Public License v2 |
| 216 |
- |
| 217 |
-EAPI=6 |
| 218 |
- |
| 219 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 220 |
-PYTHON_REQ_USE='tk?,threads(+)' |
| 221 |
- |
| 222 |
-inherit distutils-r1 eutils virtualx |
| 223 |
- |
| 224 |
-MY_PN=Pillow |
| 225 |
-MY_P=${MY_PN}-${PV} |
| 226 |
- |
| 227 |
-DESCRIPTION="Python Imaging Library (fork)" |
| 228 |
-HOMEPAGE="https://python-pillow.org/" |
| 229 |
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" |
| 230 |
- |
| 231 |
-LICENSE="HPND" |
| 232 |
-SLOT="0" |
| 233 |
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" |
| 234 |
-IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp zlib" |
| 235 |
- |
| 236 |
-REQUIRED_USE="test? ( jpeg tiff )" |
| 237 |
- |
| 238 |
-RDEPEND=" |
| 239 |
- dev-python/olefile[${PYTHON_USEDEP}] |
| 240 |
- imagequant? ( media-gfx/libimagequant:0 ) |
| 241 |
- jpeg? ( virtual/jpeg:0 ) |
| 242 |
- jpeg2k? ( media-libs/openjpeg:2= ) |
| 243 |
- lcms? ( media-libs/lcms:2= ) |
| 244 |
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] ) |
| 245 |
- tiff? ( media-libs/tiff:0=[jpeg,zlib] ) |
| 246 |
- truetype? ( media-libs/freetype:2= ) |
| 247 |
- webp? ( media-libs/libwebp:0= ) |
| 248 |
- zlib? ( sys-libs/zlib:0= )" |
| 249 |
-DEPEND="${RDEPEND} |
| 250 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
| 251 |
- doc? ( |
| 252 |
- dev-python/sphinx[${PYTHON_USEDEP}] |
| 253 |
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] |
| 254 |
- ) |
| 255 |
- test? ( |
| 256 |
- dev-python/nose[${PYTHON_USEDEP}] |
| 257 |
- media-gfx/imagemagick[png] |
| 258 |
- ) |
| 259 |
-" |
| 260 |
- |
| 261 |
-S="${WORKDIR}/${MY_P}" |
| 262 |
- |
| 263 |
-PATCHES=( |
| 264 |
- "${FILESDIR}"/pillow-4.3.0-no-scripts.patch |
| 265 |
- # can be removed at v5, patch already uptream. See bug 593816. |
| 266 |
- "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch |
| 267 |
-) |
| 268 |
- |
| 269 |
-src_prepare() { |
| 270 |
- if ! use qt5; then |
| 271 |
- # When we don't use qt5, we want to forcibly disable it by patching it |
| 272 |
- # out. Otherwise, we might encounter unexpected problems like in |
| 273 |
- # bug #662236 |
| 274 |
- eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch" |
| 275 |
- fi |
| 276 |
- eapply_user |
| 277 |
-} |
| 278 |
- |
| 279 |
-python_configure_all() { |
| 280 |
- # It's important that these flags are also passed during the install phase |
| 281 |
- # as well. Make sure of that if you change the lines below. See bug 661308. |
| 282 |
- mydistutilsargs=( |
| 283 |
- build_ext |
| 284 |
- --disable-platform-guessing |
| 285 |
- $(use_enable truetype freetype) |
| 286 |
- $(use_enable jpeg) |
| 287 |
- $(use_enable jpeg2k jpeg2000) |
| 288 |
- $(use_enable lcms) |
| 289 |
- $(use_enable tiff) |
| 290 |
- $(use_enable imagequant) |
| 291 |
- $(use_enable webp) |
| 292 |
- $(use_enable webp webpmux) |
| 293 |
- $(use_enable zlib) |
| 294 |
- ) |
| 295 |
-} |
| 296 |
- |
| 297 |
-python_compile_all() { |
| 298 |
- use doc && emake -C docs html |
| 299 |
-} |
| 300 |
- |
| 301 |
-python_test() { |
| 302 |
- "${PYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}" |
| 303 |
- virtx nosetests -vx Tests/test_*.py |
| 304 |
-} |
| 305 |
- |
| 306 |
-python_install() { |
| 307 |
- python_doheader libImaging/*.h |
| 308 |
- distutils-r1_python_install |
| 309 |
-} |
| 310 |
- |
| 311 |
-python_install_all() { |
| 312 |
- use doc && local HTML_DOCS=( docs/_build/html/. ) |
| 313 |
- if use examples ; then |
| 314 |
- docinto examples |
| 315 |
- dodoc Scripts/* |
| 316 |
- docompress -x /usr/share/doc/${PF}/examples |
| 317 |
- fi |
| 318 |
- distutils-r1_python_install_all |
| 319 |
-} |
Archives