Backport the ebuild improvements from dev-python/pillow. Remove unnecessary inherits. Add a fine-grained control over features, and a simpler feature switch mechanism. Remove unused USE=X, add shebangs to all Python scripts. Use the new python_doinclude function and EXAMPLES support.

Package-Manager: portage-2.2.0_alpha173/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 128 insertions, 16 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index d5096f687ecb..d3a1dec9a3f6 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.81 2013/02/24 12:15:03 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.82 2013/04/21 20:33:22 mgorny Exp $
+
+*imaging-1.1.7-r3 (21 Apr 2013)
+
+  21 Apr 2013; Michał Górny <mgorny@gentoo.org> +imaging-1.1.7-r3.ebuild:
+  Backport the ebuild improvements from dev-python/pillow. Remove unnecessary
+  inherits. Add a fine-grained control over features, and a simpler feature
+  switch mechanism. Remove unused USE=X, add shebangs to all Python scripts. Use
+  the new python_doinclude function and EXAMPLES support.
 
   24 Feb 2013; Agostino Sarubbo <ago@gentoo.org> imaging-1.1.7-r2.ebuild:
   Stable for x86, wrt bug #447470
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index 16a18f109466..ac27bffe6f52 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX imaging-1.1.7-giftrans.patch 530 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f SHA512 104e1685f4a01a7c6743d80328c7738b19a04415e4f941f5155e1f27237bd6db4dcb829b20b749d36031333ff44603c5d0780ccf48635d1049d236e2a458e19d WHIRLPOOL bcf324b2e85ce89ce15344c18abe2c55263f3107f127db86fbce37706bf1cbae411573bfbe27b5132114aec2002452077c38e237b2c089a8026639da5ce5def4
 AUX imaging-1.1.7-missing-math.patch 717 SHA256 9bce95374278416d183a7a5dd67de7d4b0c4e98bb7ee61dc29821a9fe2ae3a15 SHA512 73ac3c7e59fd29eed7b07042bdb3dcc0067210be0ba0f5eb536fb7076883173ee713d30da4cdc46023abda3941930069ebfacebed25549b7c4c2b677a904acb3 WHIRLPOOL 86babecb9526feaae77e6e2dc56ab116d041564ceb82ecc2f31d11689c66742f3a5e2d7cf9a871dd272c71d4250061a7a709351f38aacce9e0ed706fe44fa129
@@ -9,22 +9,25 @@ AUX imaging-1.1.7-sane.patch 401 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c57659
 DIST Imaging-1.1.7.tar.gz 498749 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211 SHA512 fec2d39b4db3cb33cd7e7895aba4c3a8a5d4cff28decb9106c88e392cb848edf5593fcd77d11994bb16321837fdb26958787dac2c86d6f7c09996f466bac11f1 WHIRLPOOL e610b4097723f77de4c495537c64741ee4bd996f89d12e2e7853fb8f09028d02fa46920a86827f263eb6324a9063d2321ff865c80b7f8482b19f8143500575e8
 EBUILD imaging-1.1.7-r1.ebuild 2692 SHA256 992c184566eccae6c69a667bdc5bb2623e9c1173bed86df308e4d97bd872037a SHA512 92bc5e80a340af4cff665253a14a0da1d57cc1b5c991634af3a4ed505f817c780dd5f662e2e6330d75b25ee6e5335699d0f46898a7876a59d3b237cd2445ab3b WHIRLPOOL 7038d0dc68d24fb73c51db6061713846c642242650ab02fff645b69f594440bf5368fa759bea04c4a470f7314ae4cd2735368c361d1a050dc8fe2432b1be044d
 EBUILD imaging-1.1.7-r2.ebuild 2355 SHA256 830994e7282c08d7066132766cafd5dc92252964959ed7fa9c291bea26a77d82 SHA512 8327814f1f664cd208b7069161e71b4e59d19c0427729f9f082a27be2375291598bbc39773e48a6b8175d08101e2011601691949ff81c4065fa9dd0a62a2e78d WHIRLPOOL 69019e0d7e04c3ab9d9efb80679e626d8be49188285bbefe80c35eb4852009928d257282c9b0cf129947754b93e7889fcf562986e7fd3ef75b2933cff9f5d4a5
-MISC ChangeLog 13532 SHA256 badaf51935d4ec777f055c65964281dec8c0113810baaeaa6cfdc29efe95bf4b SHA512 6deabc3410e219ac1dad202779670fb7ff6a61492981f3cc1ad1e868d3cc0fb1df0bff7a0ff411c47f252d71d18ae16b2f4e41eb5e941c0f4f47fb65d35dff81 WHIRLPOOL 040298015cd4f9c30768df205d4e8c18607c4271dd0212483d0d7e6a08d07eb8bdbfcf3d87c83416c0c908d39bf0e36d2bb14a7f1268e0f74e3d82946bb2fed0
+EBUILD imaging-1.1.7-r3.ebuild 2335 SHA256 61162d7d0ebd56a263a4504d6d6c9894926690e225e2dac36f770bcfc6dda745 SHA512 08dab94d191d5b39f3835e2e7ee742bc942b67921f08ddeea171c185f7fc26bc3de31e871b55c68ed7fa50f53a51c656cad8c1a9eac839b41a415023581b30d0 WHIRLPOOL e5a187c17c2ec4f4ad997523dd28e84722e2093f1fc99ae55014d83863d2aa29dfe312657df57a33e012d6e4f9cd48b9e1a046e269f202d7de9b499869a8fe39
+MISC ChangeLog 13938 SHA256 e29e08845fcdf6742d6b1cb0aa9a0e170f230b5cb642385c58948d281fe2db99 SHA512 8c337243c0c52422c34cf4790dc7f5ad49f067339c65ebabee4c0862d8dbe0484fbdc23072d62bd1bac104470d8b393e46d80a53185cf27921fac75b2b90315d WHIRLPOOL 68b3bf930866d1e81a9163238900e0329ee6e11c9b2104ca9bef89794834da91005352601658273272879566e3f556ba67b677fb4b5bc169aeb67b72fd487cf4
 MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRKgRHAAoJELp701BxlEWfghAQAMbBYTC1/SN/dI08ah3p3TIX
-tPej4F//oW5v+//00ekg4lfDOLCfW6F8PLxca5iPdz95LBfCo/uRangjR4vrLwSm
-C7CvXmSUKDXc2sd5pfaLosWA8yM5AH2x8Um+lcqfebOnBCbSnPf0ufBS6qe5//+E
-CofD4yL9XecsVnuApnoX3y3fMw+tMvtVkXtjcEVzpXELgSjomiefHFjBZOkF1hDX
-a0RJmKI1ccBbXV1Z8SOAWxaHVVyJjaMSc/hKbPSK1rkdaSEyEMi4DqS3aFwqcknC
-J4s/kGNR9ETFJQhQGZYblcaqAsc9eTPr826Cz7uqdQtSwH3c7LI19zTawdUJYn/A
-NNDyWCYXNPw0/TMABnzZFsMDafXqYDZ5rNg/HoN41Ssc86oEuQiTA38FepoBJWMa
-HvSKGmPm3el7PVv9prVK6k2z3IllhOYdAigV/vK/LZ+A9fgiJrjFBcrslN4/y5Pj
-euB2iawjoKJbZpuqUZxyyW+yxebkwU7KhaNtvHeHHyfakvzPIulxxu7MQj1RIkAr
-OSiAjnt0eKZS9hLf6cnw/g6zGyzAJSG6Somlx2YjmB7xPQRbh3dFYG9TFExmGIbA
-Ll9yhh8fOYwQzJxCfEbVquDGLsNuPu5u2amK7jlBhigSJ1LMtdb1tTF+gyzV/Poz
-4z6OdE4MtevF9Y1pfq9q
-=kP98
+iQJ8BAEBCABmBQJRdE1oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDSlYQAIDC2fuBL/vswhuRCIaN8f8A
+B5MfBZ04DnAGCal/mmEMDVhQ5Z3u7jAjy48/4wADCUtZH0XZJdwyo/Hg/xMrQnwy
+86FaBadjq+KLtZK/mJENO2H/qsCWpDdLMwCGKcbWtUzbPbivN83492m5qjNDdl6K
+6Go113kuXMqmsHMQ6sCGYzeNB/pK2PTYiX1ZeZTVJyx9P6EJDzy8CG3DFGlgIZtM
+aLa+d4eC6U3CMMuBnbsC25JkAQGhPM6VhSkS3kZyhAuJ4wXROQhhf7tNDaAxxH8M
+gQ1RIdmjMbDaKrsRlrcLyOQJtCCcbMBuL3jNAl+47qCyuDByMEcMSIML8gusnxqX
+GSQQKV84Ld22YL7xuud7o7Nr/tvDZ6VTkh1W15rMMQRfPgP8fD+aJ6w3rbGuGja/
+5nkleYLplgCneZvNh/3Aoj0w9pEnWS5sP5JQoYfiVH+k4SdywUgh7QMpPbm24uxQ
+N5aveG6WxYXyCH9ciuhTZsIho5WnryZ7QC1lRk8+OTJImImBQcbqmYLyessGWNRa
+8nVNgmAEKLx96otHdMiEvayEi9Ym/l/LcO1bNw8Ujp1Ti3Jzto2JF0ssRvfUQSyW
+p7EtEYljtciQkkKi+FpPfPilyGUCLJytsmAmMoEBtRPGR27oz25XfWoT9DrMVFQ4
+cXRAUIFIkm0qnnGAzV6t
+=SghT
 -----END PGP SIGNATURE-----
diff --git a/dev-python/imaging/imaging-1.1.7-r3.ebuild b/dev-python/imaging/imaging-1.1.7-r3.ebuild
new file mode 100644
index 000000000000..ad60d3aa87f1
--- /dev/null
+++ b/dev-python/imaging/imaging-1.1.7-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2013 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-r3.ebuild,v 1.1 2013/04/21 20:33:22 mgorny Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,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}"
+
+# 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"
+	)
+
+	# 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
+		doins Sane/demo_*.py
+	fi
+}