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

(Portage version: 2.2.14/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 13 insertions, 110 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/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= )