Version bump pillow to 2.5.3 for bug 520226

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x30380381

3 files changed, 132 insertions, 6 deletions

diff --git a/dev-python/pillow/ChangeLog b/dev-python/pillow/ChangeLog
index 02d045857f7f..a28fc9e7082b 100644
--- a/dev-python/pillow/ChangeLog
+++ b/dev-python/pillow/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pillow
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.33 2014/05/16 02:21:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.34 2014/08/19 07:20:20 djc Exp $
+
+*pillow-2.5.3 (19 Aug 2014)
+
+  19 Aug 2014; Dirkjan Ochtman <djc@gentoo.org> +pillow-2.5.3.ebuild:
+  Version bump pillow to 2.5.3 for bug 520226
 
   16 May 2014; Mike Gilbert <floppym@gentoo.org> -pillow-2.0.0-r1.ebuild,
   -pillow-2.3.0.ebuild:
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 0276f7b890bb..38cb9689bd8e 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -7,14 +7,26 @@ AUX pillow-2.0.0-libm_linking.patch 598 SHA256 eea0a0d0edc0d4392ce6ef04d400f53cf
 AUX pillow-freetype-2.5.1.patch 658 SHA256 1e283f0ee8bef9fc1bdc5e34885be8da7e246e348183a4cabc681f779f0eea65 SHA512 7868690d92ff5721b5c5ee9e1dd4741d47f2077d13fc96c3763e9a132151c787c4a55c8281998a81c2ca2d0a76cc4852091c8af083f84e48bca8bf169b831faf WHIRLPOOL de55a2214b39b8bcd95d56b798702adcd1889c859f849431ac3fe92c30837ed8a425462a2e0335a788ab17eed4c9d60591c446c518bb20f94cb070ecec3d068c
 DIST Pillow-2.3.1.zip 2421519 SHA256 014b9277c76e1e57ea3227ca9fb36f3d9ca3d2680cf11a01f4f900048c68c75f SHA512 ec575721fd3510f8e143d60e1ba96d5dac03b712abd53c9315f4aba57ab041352d8fa6bf84f427fa9d05d9be5934b5a276e0534e9517f1da566420bffa926a79 WHIRLPOOL 868586dcb77a7d9c7b8c9bb114e52d665ee983ed3bbc5f9c3940a29530e7117eed17635b0c3b0f542716a380412236ead91f7393cfae24240dc19b6280d888c8
 DIST Pillow-2.4.0.zip 6519873 SHA256 2865c68b3a5638466b1837bf4a67c447e0cfdf7463309a068aad0e90aa03f58a SHA512 8eaf087dd30f02792398d8b219a829289776c26cf014fbce6658f355e07548abec67c4e1f1203d58b938a86bdce17ceb3764b2024e095f894fc06caf05c99789 WHIRLPOOL 89ae9858a4ae44f78993036c245f4660ab0d6dc38deb91b8bc5ecc20af8ed1069af891da18d615590debbb0125b5b6e495f3a1ac7912d09c2ec5085277f73c5b
+DIST Pillow-2.5.3.zip 6873222 SHA256 62ff6c6cb88d4a1d6e856315b1691186b06cb923f18fde86d6abac9eeb9096d1 SHA512 09d8cb9391f1627e01898eef15109ddd1deecc0bcd342f35e85b7cc0eacc61952ed8c297c460b858815d05ed9ab65c3674ef1c4b73d583ff37fd7eed7368af35 WHIRLPOOL 99f8bd559eaad619db872bb29673abd0073dc5e3f4f85056e51a4e59c5e85193de10934e4b725ef9b40af535c8dac7128debf441982fa3a2355411944d495527
 EBUILD pillow-2.3.1.ebuild 2504 SHA256 77914decba56e3f86c42249cebf24bb66519d57e3975e95f7128a81a4ae88a64 SHA512 0d2c301e077e61d6f9c984707437c56d303cb193b762f5197ea458f2d8647577b20c226ce2f50c967304639a7a5ee5efd535bb85dae2fbc0aae1819462e82708 WHIRLPOOL d9b3f72c3bab464ff1a32e4d6353a2b490670ee9ae2853e66da4d500b86f87d362014fd37ce7e9f98649efceb41b647e5413e26941465707cc0585d6661e8f42
 EBUILD pillow-2.4.0.ebuild 2630 SHA256 20c628292eb49d80b1f3b98fdaf5723668462871a2235a3b75776360fd140319 SHA512 c503bfc7ad4653ac3df32f14ede41a373ed5f5c60728de184472567f3241d3c73d091a656eb07c1bf99bb3cc58c7d8db6ddaaa1a8f1bc0b9ffff088b52943d29 WHIRLPOOL f462383d23f18d3ddb527c57340e549678950635dd659953227755fbc0245305e92e491485a9b962bb327f5a77e232436fc3af21f34ca62837ef3c935f68f6a9
-MISC ChangeLog 4400 SHA256 24a1ddfe596209e46a91a369686cd5045d2cdb19819b0d094f2eb16019794838 SHA512 56195b678ca3b5c77e51d9707546a0dcbb380bf3b2a3eef49c7eabca352dbe1aadf6fb5c0ca5e2a53914be4603500e42ac73dd5c7ac56251fd5e0d202044cc61 WHIRLPOOL b1db849265905dc21318df943b2b31089dce706a9991ff96d215e9e12963a37eb4c4f9e116d0844691682c62d2e87f8fe7e05db38bc8b3e0281682a6db7572a6
+EBUILD pillow-2.5.3.ebuild 2638 SHA256 1caad81368b59e3c847d628465564225f120870e545590900c6c6fc2bf645aad SHA512 16a904f6bdbca10515db42750da1307c01bfe09c6b2c028112461694c06cfb103faa511599dc30c9056f75b84499af09806d0df75bdc5ee4a54a2f371335bead WHIRLPOOL 29c0f15624d98373bbc6e070d643bf710b6cf0006561b1758839f86e584aa7734f84746902433f5fedbb9b1d7b3aaa6a4a5c8e1f3c3447ff961307dfebc87a5b
+MISC ChangeLog 4542 SHA256 7ab9d132f2380fa0b91770ab8951c416ae1224f65f01f127c9477f2a959f603c SHA512 ecb07441c8fb79cb5f81813442fd8f28cb855f278943d2aeafa019fbae8630ac4114faa228147f534138a18df0d6af07da25400033709c7d43e6bd57fb3d0568 WHIRLPOOL e1640aac43616985ee780152d2a3f2ca6a42409485815d70b9a122d0b73fda0278f5794fe6f0b3cd607eb5b7453d65e3c5bdc96bf8fc274e0fc05b4f09af47cf
 MISC metadata.xml 240 SHA256 c074ff55f0a36445f041979a1f7ed66e1993313aad3d5a5e4f202dc842de7831 SHA512 837f01165c567829d1e8fab358907f8239042976a9f44a6cd0a7fd37070a8b5c275a2ddf836d9967c948c049927264eac917aae6093300258db319d5051c9769 WHIRLPOOL 4d7615634e94a9dd43de3945018123529c92576b4f0298500fa728204540f7ae1e8e618fa838ae34852f336a28771fc89a7bb3b18a7819ae3da061f1afdab1b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlN1digACgkQC77qH+pIQ6TmawD8C6AL7iooZw5Q7zCh8Ne43U7z
-98YxOw3IrEcu6u/bjmsBAJcKEZb92IAIG8vP3zaTViXBkvGuFgWLyvfWf1kWcljK
-=Nu62
+iQIcBAEBCAAGBQJT8vrdAAoJEJ+WuSkwOAOBXqoQAMRcocQaTimaq9CUSrht6B2f
+BLZRhTCtLSiqRC3vecbHNQN9r7SLpnfHml7Zzt3bBpRo8muueJeVcG2SkI0+eGJu
+FJwsgNWtXbgvG8Sjb2chheRE83jOh2ZjS9GX5OycMgX4FguwUZRyxVlIUOoGqpSF
+ClWBg9QOEAdjRjceL9BB5gmOccrke0PRrMDgFyDtYu/DOpr0atvNyKxCacJXNn7R
+CTQ8YOCafYa2YQMkNEBuI+ylhdMc9+TcagXBNYwafuSSHKRbVtzFcesqivB3z/QY
+LGEdWOrXvmnnVir+VwccOPBVNjL8vLMUKwsIyUeOyQCGQtoF/adMAwr9b0IYtT++
+ZaOkYtbKpGmP7N9TtdbsX7W5/ZKlXn0k6qR1gOT2/YZYF3r001cfA5Ri1wxpNA0y
+nDuTHZh3+CF+lty/YRgvBMTa4QANl4W1tWGB9nK/QOvJjrWIO+CwRLaGhFC7cqL0
+UPHZUkV5q9+o6g5fFgEeQZ9OPGB4oryH4inCWAQU1byDoT9VIXbID9ByiDKaDWW3
+MQXfFoDohGYFZ6kNJdUym9ujJw2JodgAKw6BiGhGZSDq+87Urk0dsIxAls3XChM7
+GRtA22PbMVJBw7RWk+HTpFTovmhywRCien4beajg0t4n6ioEglrWzB1IgrS1Ycx6
+jnFCK4e53yn3TzRwpqr9
+=RchQ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pillow/pillow-2.5.3.ebuild b/dev-python/pillow/pillow-2.5.3.ebuild
new file mode 100644
index 000000000000..a3d12fb94cd6
--- /dev/null
+++ b/dev-python/pillow/pillow-2.5.3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.5.3.ebuild,v 1.1 2014/08/19 07:20:20 djc Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
+PYTHON_REQ_USE='tk?'
+
+inherit distutils-r1 eutils
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://github.com/python-imaging/Pillow https://pypi.python.org/pypi/Pillow"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples jpeg jpeg2k lcms scanner test tiff tk truetype webp zlib"
+REQUIRED_USE="test? ( jpeg )"
+
+RDEPEND="
+	truetype? ( media-libs/freetype:2= )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:0= )
+	scanner? ( media-gfx/sane-backends:0= )
+	tiff? ( media-libs/tiff:0= )
+	webp? ( media-libs/libwebp:0= )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx
+		dev-python/sphinx-better-theme
+	)"
+RDEPEND+=" !dev-python/imaging"
+
+S="${WORKDIR}/${MY_P}"
+
+# See _render and _clean in Tests/test_imagefont.py
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Disable all the stuff we don't want.
+	local f
+	for f in jpeg lcms tiff tk webp zlib; do
+		if ! use ${f}; then
+			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
+		fi
+	done
+	if ! use truetype; then
+		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
+	fi
+	if ! use jpeg2k; then
+		sed -i -e 's:feature.jpeg2000 =:& None #:' setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+# XXX: split into two ebuilds?
+wrap_phase() {
+	"${@}"
+
+	if use scanner; then
+		cd Sane || die
+		"${@}"
+	fi
+}
+
+python_compile() {
+	wrap_phase distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" selftest.py --installed || die "Tests fail with ${EPYTHON}"
+	"${PYTHON}" Tests/run.py --installed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader libImaging/{Imaging.h,ImPlatform.h}
+
+	wrap_phase distutils-r1_python_install
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	use examples && local EXAMPLES=( Scripts/. )
+
+	distutils-r1_python_install_all
+
+	if use scanner; then
+		docinto sane
+		dodoc Sane/{CHANGES,README,sanedoc.txt}
+	fi
+
+	if use examples && use scanner; then
+		docinto examples/sane
+		dodoc Sane/demo_*.py
+	fi
+}