Drop lcms support, bug 526808.

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

5 files changed, 17 insertions, 122 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index 4d2b89143eaf..8cdbbd2cd570 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.94 2014/12/18 20:30:01 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.95 2014/12/30 18:23:18 floppym Exp $
+
+  30 Dec 2014; Mike Gilbert <floppym@gentoo.org> -imaging-1.1.7-r4.ebuild,
+  imaging-1.1.7-r1.ebuild, imaging-1.1.7-r2.ebuild, imaging-1.1.7-r5.ebuild:
+  Drop lcms support, bug 526808.
 
   18 Dec 2014; Patrice Clement <monsieurp@gentoo.org> imaging-1.1.7-r4.ebuild:
   Added fix to -r4 file accidentally. Removing it.
diff --git a/dev-python/imaging/imaging-1.1.7-r1.ebuild b/dev-python/imaging/imaging-1.1.7-r1.ebuild
index 7bc3951454be..b945348fa315 100644
--- a/dev-python/imaging/imaging-1.1.7-r1.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.13 2013/05/28 22:47:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r1.ebuild,v 1.14 2014/12/30 18:23:18 floppym Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -20,11 +20,10 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 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 lcms scanner tk X"
+IUSE="doc examples scanner tk X"
 
 DEPEND="virtual/jpeg
 	media-libs/freetype:2
-	lcms? ( media-libs/lcms:0 )
 	scanner? ( media-gfx/sane-backends )
 	X? ( x11-misc/xdg-utils )"
 RDEPEND="${DEPEND}"
@@ -46,9 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-sane.patch"
 	epatch "${FILESDIR}/${P}-giftrans.patch"
 	epatch "${FILESDIR}/${P}-missing-math.patch"
-	if ! use lcms; then
-		epatch "${FILESDIR}/${P}-nolcms.patch"
-	fi
+	epatch "${FILESDIR}/${P}-nolcms.patch"
 
 	# Add shebang.
 	sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \
diff --git a/dev-python/imaging/imaging-1.1.7-r2.ebuild b/dev-python/imaging/imaging-1.1.7-r2.ebuild
index c625b9e5de27..f2ffc7987274 100644
--- a/dev-python/imaging/imaging-1.1.7-r2.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.6 2013/09/05 18:46:38 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r2.ebuild,v 1.7 2014/12/30 18:23:18 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,11 +17,10 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 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 lcms scanner tk X"
+IUSE="doc examples scanner tk X"
 
 DEPEND="virtual/jpeg
 	media-libs/freetype:2
-	lcms? ( media-libs/lcms:0 )
 	scanner? ( media-gfx/sane-backends )
 	X? ( x11-misc/xdg-utils )"
 RDEPEND="${DEPEND}"
@@ -35,10 +34,9 @@ python_prepare_all() {
 		"${FILESDIR}/${P}-sane.patch"
 		"${FILESDIR}/${P}-giftrans.patch"
 		"${FILESDIR}/${P}-missing-math.patch"
+		"${FILESDIR}/${P}-nolcms.patch"
 	)
 
-	use lcms || PATCHES+=( "${FILESDIR}/${P}-nolcms.patch" )
-
 	# Add shebang.
 	sed -e "1i#!/usr/bin/python" -i Scripts/pilfont.py \
 		|| die "sed	failed adding shebang"
diff --git a/dev-python/imaging/imaging-1.1.7-r4.ebuild b/dev-python/imaging/imaging-1.1.7-r4.ebuild
deleted file mode 100644
index 070a75086bf2..000000000000
--- a/dev-python/imaging/imaging-1.1.7-r4.ebuild
+++ /dev/null
@@ -1,104 +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/imaging/imaging-1.1.7-r4.ebuild,v 1.6 2014/12/18 20:30:01 monsieurp Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-PYTHON_REQ_USE='tk?'
-
-inherit distutils-r1
-
-MY_P=Imaging-${PV}
-
-DESCRIPTION="Python Imaging Library (PIL)"
-HOMEPAGE="http://www.pythonware.com/products/pil/index.htm"
-SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
-
-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 zlib"
-
-RDEPEND="
-	truetype? ( media-libs/freetype:2 )
-	jpeg? ( virtual/jpeg )
-	lcms? ( media-libs/lcms:0 )
-	scanner? ( media-gfx/sane-backends )
-	tiff? ( media-libs/tiff )
-	zlib? ( sys-libs/zlib )
-	!dev-python/pillow"
-DEPEND="${RDEPEND}"
-RDEPEND+=" !dev-python/pillow"
-
-# Tests don't handle missing jpeg, tiff & zlib properly.
-REQUIRED_USE="test? ( jpeg tiff zlib )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-no-xv.patch"
-		"${FILESDIR}/${P}-sane.patch"
-		"${FILESDIR}/${P}-giftrans.patch"
-		"${FILESDIR}/${P}-missing-math.patch"
-		"${FILESDIR}/${P}-ft-header-include.patch"
-	)
-
-	# Add shebangs.
-	sed -e "1i#!/usr/bin/env python" -i Scripts/*.py || die
-
-	# Disable all the stuff we don't want.
-	local f
-	for f in jpeg lcms tiff tk 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_test() {
-	"${PYTHON}" selftest.py || 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/. )
-	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
-		docompress -x /usr/share/${PF}/examples
-	fi
-}
diff --git a/dev-python/imaging/imaging-1.1.7-r5.ebuild b/dev-python/imaging/imaging-1.1.7-r5.ebuild
index 84a80bd18c95..86745a28cac7 100644
--- a/dev-python/imaging/imaging-1.1.7-r5.ebuild
+++ b/dev-python/imaging/imaging-1.1.7-r5.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/imaging/imaging-1.1.7-r5.ebuild,v 1.1 2014/12/18 20:24:34 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.7-r5.ebuild,v 1.2 2014/12/30 18:23:18 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -17,12 +17,11 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 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 zlib"
+IUSE="doc examples jpeg scanner test tiff tk truetype zlib"
 
 RDEPEND="
 	truetype? ( media-libs/freetype:2 )
 	jpeg? ( virtual/jpeg )
-	lcms? ( media-libs/lcms:0 )
 	scanner? ( media-gfx/sane-backends )
 	tiff? ( media-libs/tiff )
 	zlib? ( sys-libs/zlib )
@@ -50,7 +49,7 @@ python_prepare_all() {
 
 	# Disable all the stuff we don't want.
 	local f
-	for f in jpeg lcms tiff tk zlib; do
+	for f in jpeg tiff tk zlib; do
 		if ! use ${f}; then
 			sed -i -e "s:feature.${f} =:& None #:" setup.py || die
 		fi
@@ -58,6 +57,7 @@ python_prepare_all() {
 	if ! use truetype; then
 		sed -i -e 's:feature.freetype =:& None #:' setup.py || die
 	fi
+	sed -i -e "s:feature.lcms =:& None #:" setup.py || die
 
 	distutils-r1_python_prepare_all
 }