commit: 3f782b122d0ef16c14b25510dca3050acbd51c33
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 1 18:45:00 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Mon Oct 1 18:45:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f782b12
dev-python/pillow: remove old
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
dev-python/pillow/Manifest | 1 -
.../pillow-4.3.0-freetype2.9-test-metrics.patch | 12 ---
dev-python/pillow/files/pillow-4.3.0-no-qt.patch | 30 ------
.../pillow/files/pillow-4.3.0-no-scripts.patch | 12 ---
dev-python/pillow/pillow-4.3.0-r2.ebuild | 95 ------------------
dev-python/pillow/pillow-4.3.0-r3.ebuild | 106 ---------------------
6 files changed, 256 deletions(-)
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 39808e9ddae..550e53d9fe8 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,4 +1,3 @@
DIST Pillow-3.4.2.zip 11042238 BLAKE2B
334af6eeadb3203b51572eca6ad9c196f3eeac14da0f1aedc351db692b33d413fdf5bc5c8564d2f53c324d9485dbdbda664b75a570b779e24f238c21829b4a39
SHA512
5e05206db5bc1b4177384f7e91ee79015c6e1bbdc7c31c997da054391b9b5ec7c1ebdec258a33f598986533894f3324b03d0b4b385b94e72a0517a3437553b39
-DIST Pillow-4.3.0.tar.gz 13874155 BLAKE2B
c2258efe2727adeb7ba370fe30ef9bbabe952a1f6690e7904352884951e648d2c0e2037143b7c71a802ea1a04a2f7827a001621480036e43f6c01a96de3edcf7
SHA512
5811252802bd01ac86157235d42138685e746723df48b67ec7c7ebd3f172532b40cf86ca9d3d792e82f03986303a084bf3491c0d511dc068dea1bc631afdeabb
DIST Pillow-5.2.0.tar.gz 14499068 BLAKE2B
7111eb8e2911cc197b66bbc06a13459484e2c4a1f5037e4bcf702ea350763b2b758cbeef9749aeb29f1ab64d33081131f7e46a3fbb33fee48e70660f8f75eddb
SHA512
2f19512d0573bd4696a5b4d54ff21473492f92705d33bd0994ccd085028d209bfb0031e2b95947c1e8fc9d0b0956cdf1f705c1fbaff39390791cac1708bff22c
DIST Pillow-5.3.0.tar.gz 15553718 BLAKE2B
df93d136fb5a5ea3021a757edea5dfa7b3fc1f7a71b0f64f1d1d11b95a5dafffad98d3f7b28d5e7c07b1c93d154c9c73a688f37771587c91fb7bfb6956079375
SHA512
0596207069a87a645f7694b19ea5100d753dbb7553148fa5982b073e4e1163b5bd83ddf8b1c783a90a0b718576f08d3f15352f2742d46a425cf639de2409c4ab
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
deleted file mode 100644
index 211ef7ac58d..00000000000
--- a/dev-python/pillow/files/pillow-4.3.0-freetype2.9-test-metrics.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Tests/test_imagefont.py
-+++ b/Tests/test_imagefont.py
-@@ -58,6 +58,9 @@ class TestImageFont(PillowTestCase):
- ('2', '8'): {'multiline': 6.2,
- 'textsize': 2.5,
- 'getters': (12, 16)},
-+ ('2', '9'): {'multiline': 6.2,
-+ 'textsize': 2.5,
-+ 'getters': (12, 16)},
- 'Default': {'multiline': 0.5,
- 'textsize': 0.5,
- 'getters': (12, 16)},
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
deleted file mode 100644
index 231c605b834..00000000000
--- a/dev-python/pillow/files/pillow-4.3.0-no-qt.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/PIL/ImageQt.py b/PIL/ImageQt.py
-index 36b4e1eb..ddde2cd9 100644
---- a/PIL/ImageQt.py
-+++ b/PIL/ImageQt.py
-@@ -20,24 +20,7 @@ from . import Image
- from ._util import isPath
- from io import BytesIO
-
--qt_is_installed = True
--qt_version = None
--try:
-- from PyQt5.QtGui import QImage, qRgba, QPixmap
-- from PyQt5.QtCore import QBuffer, QIODevice
-- qt_version = '5'
--except (ImportError, RuntimeError):
-- try:
-- from PyQt4.QtGui import QImage, qRgba, QPixmap
-- from PyQt4.QtCore import QBuffer, QIODevice
-- qt_version = '4'
-- except (ImportError, RuntimeError):
-- try:
-- from PySide.QtGui import QImage, qRgba, QPixmap
-- from PySide.QtCore import QBuffer, QIODevice
-- qt_version = 'side'
-- except ImportError:
-- qt_is_installed = False
-+qt_is_installed = False
-
-
- def rgb(r, g, b, a=255):
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
deleted file mode 100644
index c30b00d54d7..00000000000
--- a/dev-python/pillow/files/pillow-4.3.0-no-scripts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/562682
-
---- a/setup.py
-+++ b/setup.py
-@@ -779,7 +779,6 @@ try:
- ext_modules=[Extension("PIL._imaging", ["_imaging.c"])],
- include_package_data=True,
- packages=find_packages(),
-- scripts=glob.glob("Scripts/*.py"),
- install_requires=['olefile'],
- test_suite='nose.collector',
- keywords=["Imaging", ],
diff --git a/dev-python/pillow/pillow-4.3.0-r2.ebuild
b/dev-python/pillow/pillow-4.3.0-r2.ebuild
deleted file mode 100644
index 25dddfce611..00000000000
--- a/dev-python/pillow/pillow-4.3.0-r2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/";
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
- dev-python/olefile[${PYTHON_USEDEP}]
- imagequant? ( media-gfx/libimagequant:0 )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- tiff? ( media-libs/tiff:0=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:0= )
- zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- media-gfx/imagemagick[png]
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/pillow-4.3.0-no-scripts.patch
- # can be removed at v5, patch already uptream. See bug 593816.
- "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
-)
-
-python_configure_all() {
- # It's important that these flags are also passed during the install
phase
- # as well. Make sure of that if you change the lines below. See bug
661308.
- mydistutilsargs=(
- build_ext
- --disable-platform-guessing
- $(use_enable truetype freetype)
- $(use_enable jpeg)
- $(use_enable jpeg2k jpeg2000)
- $(use_enable lcms)
- $(use_enable tiff)
- $(use_enable imagequant)
- $(use_enable webp)
- $(use_enable webp webpmux)
- $(use_enable zlib)
- )
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- "${PYTHON}" selftest.py --installed || die "selftest failed with
${EPYTHON}"
- virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
- python_doheader libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples ; then
- docinto examples
- dodoc Scripts/*
- docompress -x /usr/share/doc/${PF}/examples
- fi
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pillow/pillow-4.3.0-r3.ebuild
b/dev-python/pillow/pillow-4.3.0-r3.ebuild
deleted file mode 100644
index a799e79a1d3..00000000000
--- a/dev-python/pillow/pillow-4.3.0-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE='tk?,threads(+)'
-
-inherit distutils-r1 eutils virtualx
-
-MY_PN=Pillow
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python Imaging Library (fork)"
-HOMEPAGE="https://python-pillow.org/";
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples imagequant jpeg jpeg2k lcms qt5 test tiff tk truetype webp
zlib"
-
-REQUIRED_USE="test? ( jpeg tiff )"
-
-RDEPEND="
- dev-python/olefile[${PYTHON_USEDEP}]
- imagequant? ( media-gfx/libimagequant:0 )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:2= )
- lcms? ( media-libs/lcms:2= )
- qt5? ( dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}] )
- tiff? ( media-libs/tiff:0=[jpeg,zlib] )
- truetype? ( media-libs/freetype:2= )
- webp? ( media-libs/libwebp:0= )
- zlib? ( sys-libs/zlib:0= )"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- media-gfx/imagemagick[png]
- )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/pillow-4.3.0-no-scripts.patch
- # can be removed at v5, patch already uptream. See bug 593816.
- "${FILESDIR}"/pillow-4.3.0-freetype2.9-test-metrics.patch
-)
-
-src_prepare() {
- if ! use qt5; then
- # When we don't use qt5, we want to forcibly disable it by
patching it
- # out. Otherwise, we might encounter unexpected problems like in
- # bug #662236
- eapply "${FILESDIR}/${PN}-4.3.0-no-qt.patch"
- fi
- eapply_user
-}
-
-python_configure_all() {
- # It's important that these flags are also passed during the install
phase
- # as well. Make sure of that if you change the lines below. See bug
661308.
- mydistutilsargs=(
- build_ext
- --disable-platform-guessing
- $(use_enable truetype freetype)
- $(use_enable jpeg)
- $(use_enable jpeg2k jpeg2000)
- $(use_enable lcms)
- $(use_enable tiff)
- $(use_enable imagequant)
- $(use_enable webp)
- $(use_enable webp webpmux)
- $(use_enable zlib)
- )
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- "${PYTHON}" selftest.py --installed || die "selftest failed with
${EPYTHON}"
- virtx nosetests -vx Tests/test_*.py
-}
-
-python_install() {
- python_doheader libImaging/*.h
- distutils-r1_python_install
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- if use examples ; then
- docinto examples
- dodoc Scripts/*
- docompress -x /usr/share/doc/${PF}/examples
- fi
- distutils-r1_python_install_all
-}
