Recent versions of pillow use lcms:2. Bug 526810.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

5 files changed, 19 insertions, 128 deletions

diff --git a/dev-python/pillow/ChangeLog b/dev-python/pillow/ChangeLog
index 5d6414c299d1..64c9ae59728d 100644
--- a/dev-python/pillow/ChangeLog
+++ b/dev-python/pillow/ChangeLog
@@ -1,6 +1,14 @@
 # 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.42 2014/10/13 11:36:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.43 2014/10/26 03:08:24 floppym Exp $
+
+*pillow-2.4.0-r1 (26 Oct 2014)
+*pillow-2.5.3-r1 (26 Oct 2014)
+
+  26 Oct 2014; Mike Gilbert <floppym@gentoo.org> +pillow-2.4.0-r1.ebuild,
+  +pillow-2.5.3-r1.ebuild, -pillow-2.3.1.ebuild, -pillow-2.4.0.ebuild,
+  -pillow-2.5.3.ebuild:
+  Recent versions of pillow use lcms:2. Bug 526810.
 
   13 Oct 2014; Anthony G. Basile <blueness@gentoo.org> pillow-2.5.3.ebuild:
   Stable on ppc and ppc64, bug #522426
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 5b40aee52d6d..ef59d6f7cd4d 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -5,28 +5,16 @@ AUX imaging-1.1.7-no-xv.patch 691 SHA256 d692f9085fefb06559ee63628852ce72a498657
 AUX pillow-2.0.0-delete_hardcoded_paths.patch 7309 SHA256 400cb4029d59e6f80aea05051f10cedbb9937ce043ab764f8dfad845cfbabf72 SHA512 add72ba5df003162b29a0b034edc24bd18505ecd09ee80cc2ad7606a00e25f7918bf30bc1749961de341920c3b24743baffe16e6cf6060bf4a4fad6ca8b564ce WHIRLPOOL 43045044d725060c12cfe214154a27332756e5d0c4a9bae3ad792ca94d7107932cf61159af8bb3deaff9f5e104006f1fd28163a051b4465cc42d61d303c672a1
 AUX pillow-2.0.0-libm_linking.patch 598 SHA256 eea0a0d0edc0d4392ce6ef04d400f53cfee63d7093e4ee368ad491e5a5d2c872 SHA512 ab64b551e2782ab9537c826ea1237da4a38f897d14ee8d87e39e74108f6403ce20f86d133c09ef51b920b4395a9ef68af686b19b505174a5c6f6cf0c7e2d6572 WHIRLPOOL 921c536f7ea50c779bd2c93ed07c00c69116af16861ae30f2cd4010a524c2bd79711e1ad92ade0159ec25425bc8c5b4e6b65bdbef86d99cd47fd504e20106523
 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
-EBUILD pillow-2.5.3.ebuild 2642 SHA256 dfb861819f251ef9e66688a2915f7fd3436b83f5548f1886eb26534bbd47d93c SHA512 0c6821380a8ad7e921ed9642d6ba67a60a723720b986cc9ff27df35187c5d9dccea75e63d6e9f82f4a35d0e97921a4dcb1890b3d2734ef1fcb148f8a0c92547b WHIRLPOOL 7a1a2ac698b374a7595d04770eae8fa310bd4ca84cddfeb8a717fa886b910aab20c15684e2d65a33fbba4dcc023350e2614b847bbe79522be68ffca73aa51018
-MISC ChangeLog 5367 SHA256 33b8a4409b746b83551dc6a735281fd69d1926acc52e164d5f548b811bfdf799 SHA512 d3c234c3f4eee20351d18cbaf807bdb85d3b3c6c25a3a02ad5459aff37941fafd5369df69ca5b293f64fd950e0f120acf5bf3ce6868c6cabfc4e4b6bef8999a1 WHIRLPOOL 992beb574bc884e908428bd75097cfc3108e1f96bfb00dd9d2d27f211091d050459e3f1728c09ad662058e486ddb6a0c03d73556af1c2ba784f324340dd1b5d0
+EBUILD pillow-2.4.0-r1.ebuild 2636 SHA256 84e3b27b8dab7fab9f5095fa93f39a96cb6e5dd219b9e036d46b882a5c4bfe99 SHA512 4df6bf8fbfe9fe541978ef79ed2294d1e2679e140a056e8281cbc0d601eab259e47935ebea411b7296b75d59cb1cf6afe653bda7b47787f1f2eca11abe16e442 WHIRLPOOL 6fb6085afc1b47664af3a2d36ae58d49545289a07314be0bd3ade6552f09cba75745927593af4f9c824c67ea6d341a3bcb4b11b32c93778f2d62f1802b70e853
+EBUILD pillow-2.5.3-r1.ebuild 2644 SHA256 ff28e649674b8e2e20cc454a911ef7841757665fad005b3f8a32fa1c39883853 SHA512 b783f1681e524ffe629aced542847de2595d43478209695c60e41e933b83abc35c2658d3d068608ec88504c0f7d13ec4c84fe9fb3f8f61620488a7d4332de210 WHIRLPOOL 2c117de219574dabcb03d200bae0345207ee0048b11cbfd80dedb623c67a88b23df56fd3c8b4beb380b9263be7e870ff2a94cb983e33e3059ba7cccf6c0c2ae0
+MISC ChangeLog 5651 SHA256 c09eb7ecbf121b09c5f7171b17f389d3e63627dedba23d6881f80a84c2bad21c SHA512 86d531915fa4c4680d5706bc57246d7e7a52299c5fb681a309470cb13f7d57efde8aacb106c17c1a63578aa1f7ad4a2a8a44fe133194e325af944a655325ff2a WHIRLPOOL 246cca4adceb834b5cecc2cd915c112dc4ad1dff6778fc563bd348627b0b8fc711594dea9d4f33a2812198055cf08f40c79751a696f02cee0ff427bf95775e2b
 MISC metadata.xml 240 SHA256 c074ff55f0a36445f041979a1f7ed66e1993313aad3d5a5e4f202dc842de7831 SHA512 837f01165c567829d1e8fab358907f8239042976a9f44a6cd0a7fd37070a8b5c275a2ddf836d9967c948c049927264eac917aae6093300258db319d5051c9769 WHIRLPOOL 4d7615634e94a9dd43de3945018123529c92576b4f0298500fa728204540f7ae1e8e618fa838ae34852f336a28771fc89a7bb3b18a7819ae3da061f1afdab1b5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUO7lyAAoJEJOE+m71LUu6m2wP/10Iz2FcXNjVtalLCmBHQSBX
-zChtYMdhVunfqAVu3dZW5UoB/HmDZLhBx6ox/v3oyFT2PMgMXqer1xPQTaSb4DUq
-rwBFlmf5TcQK8lgzidEzBJ42IE+uzmCSmRD45QoLgvU4q0tTirE3I3xN6IzK6qM9
-jGo8SipT3MoDhRrfOjyQwa0K/n0aCap+d3EEnQzlXURKNBu8/Dt/KlNFH1ZjaUSz
-qr+x2jeGE6SjAuP7IKjfDeL8Bh1xFwupdifSCCqXKh292uLEMg53CcRHVCAbt0hv
-YRUEIiOaUvFOq79Bzr1on0FVJQAnBqF2WxZFWcMLyJdzFcwFBUZ50FqBMcMimCbG
-fKM9lPrQNVZ/fo62WpnstT1/svWKl1iV3UJa2805/Moythr5aPyYFQAX/U4S49y0
-qqUSmH49vtco+LZ2yYLf4WXJ06wNO5KW/I4GIR3YlK4WnsDFnzDvf9RfwJB9I77t
-qUqjkyzmfVsbrKVSRa30aaagu9/Mf/j4t7hra7gzRBEGr3vKxNLuqqXvq6KNV11Q
-Y3FIiTKx+DT0FgiLTmk8BhmnMrUDjIB0pJOk1ra0IgBWUjlquGI/pYGUt0E38CKV
-HgTLakGrNTKOftD8diyHEOvfRQ5jg2NrT2IDSZPpmR18OUYIJP3sPr8af2HbJbNl
-3YxFT2bxi+ru46pNqveS
-=XKul
+iF4EAREIAAYFAlRMZakACgkQC77qH+pIQ6T6OwD/QcTr3w0bRAxEQ6Cp9k1qCj8s
+ch+3CNdA2ZrVgZl3UFABAIZTRUSR3DiUL4FydeXm99P8C0a/CBLm+wdx8RRjdx6A
+=BdNq
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pillow/pillow-2.3.1.ebuild b/dev-python/pillow/pillow-2.3.1.ebuild
deleted file mode 100644
index fa7d8d575959..000000000000
--- a/dev-python/pillow/pillow-2.3.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.3.1.ebuild,v 1.1 2014/04/18 13:39:06 floppym Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-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 lcms scanner test tiff tk truetype webp zlib"
-REQUIRED_USE="test? ( jpeg )"
-
-RDEPEND="
-	truetype? ( media-libs/freetype:2= )
-	jpeg? ( virtual/jpeg )
-	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
-
-	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
-}
diff --git a/dev-python/pillow/pillow-2.4.0.ebuild b/dev-python/pillow/pillow-2.4.0-r1.ebuild
index 383601a7cffe..cce5de95d38b 100644
--- a/dev-python/pillow/pillow-2.4.0.ebuild
+++ b/dev-python/pillow/pillow-2.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.0.ebuild,v 1.11 2014/05/14 16:11:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.4.0-r1.ebuild,v 1.1 2014/10/26 03:08:24 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -25,7 +25,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2= )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:0= )
+	lcms? ( media-libs/lcms:2= )
 	scanner? ( media-gfx/sane-backends:0= )
 	tiff? ( media-libs/tiff:0= )
 	webp? ( media-libs/libwebp:0= )
diff --git a/dev-python/pillow/pillow-2.5.3.ebuild b/dev-python/pillow/pillow-2.5.3-r1.ebuild
index b40f4c1055c6..284545aaf388 100644
--- a/dev-python/pillow/pillow-2.5.3.ebuild
+++ b/dev-python/pillow/pillow-2.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.9 2014/10/13 11:36:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.5.3-r1.ebuild,v 1.1 2014/10/26 03:08:24 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
@@ -25,7 +25,7 @@ RDEPEND="
 	truetype? ( media-libs/freetype:2= )
 	jpeg? ( virtual/jpeg:0 )
 	jpeg2k? ( media-libs/openjpeg:2= )
-	lcms? ( media-libs/lcms:0= )
+	lcms? ( media-libs/lcms:2= )
 	scanner? ( media-gfx/sane-backends:0= )
 	tiff? ( media-libs/tiff:0= )
 	webp? ( media-libs/libwebp:0= )