Remove buggy version, bug 497778.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 7 insertions, 111 deletions

diff --git a/dev-python/pillow/ChangeLog b/dev-python/pillow/ChangeLog
index 5dab25c8ad72..811690c88cd0 100644
--- a/dev-python/pillow/ChangeLog
+++ b/dev-python/pillow/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2014/01/25 18:12:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/ChangeLog,v 1.19 2014/01/25 19:17:36 floppym Exp $
+
+  25 Jan 2014; Mike Gilbert <floppym@gentoo.org> -pillow-2.1.0.ebuild,
+  pillow-2.3.0.ebuild:
+  Remove buggy version, bug 497778.
 
 *pillow-2.3.0 (25 Jan 2014)
 
diff --git a/dev-python/pillow/pillow-2.1.0.ebuild b/dev-python/pillow/pillow-2.1.0.ebuild
deleted file mode 100644
index e7c83f7edc5c..000000000000
--- a/dev-python/pillow/pillow-2.1.0.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.1.0.ebuild,v 1.5 2013/12/08 22:50:18 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 tiff tk truetype webp zlib"
-
-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 )"
-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() {
-	# Apply patches before executing sed.
-	local patches=(
-		"${FILESDIR}/imaging-1.1.7-no-xv.patch"
-		"${FILESDIR}/pillow-freetype-2.5.1.patch"
-	)
-	epatch "${patches[@]}"
-
-	# 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.3.0.ebuild b/dev-python/pillow/pillow-2.3.0.ebuild
index 91bcc08d4938..c8ec560dda89 100644
--- a/dev-python/pillow/pillow-2.3.0.ebuild
+++ b/dev-python/pillow/pillow-2.3.0.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.3.0.ebuild,v 1.1 2014/01/25 18:12:58 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pillow/pillow-2.3.0.ebuild,v 1.2 2014/01/25 19:17:36 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -19,7 +19,7 @@ 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 )"
+#REQUIRED_USE="test? ( jpeg )"
 
 RDEPEND="
 	truetype? ( media-libs/freetype:2= )