Version bump dev-python/imaging-1.1.7.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

7 files changed, 176 insertions, 2 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index aa333ddf22b3..4518b733e391 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.51 2009/11/14 16:44:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.52 2009/11/30 09:42:33 djc Exp $
+
+*imaging-1.1.7 (30 Nov 2009)
+
+  30 Nov 2009; Dirkjan Ochtman <djc@gentoo.org> +imaging-1.1.7.ebuild,
+  +files/imaging-1.1.7-giftrans.patch,
+  +files/imaging-1.1.7-missing-math.patch, +files/imaging-1.1.7-no-xv.patch,
+  +files/imaging-1.1.7-sane.patch:
+  Version bump to 1.1.7. TIFF endianness seems to be included.
 
   14 Nov 2009; Raúl Porcel <armin76@gentoo.org> imaging-1.1.6-r1.ebuild:
   ia64/sparc stable wrt #287560
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index c8e4c3408894..9d0a543de011 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -3,7 +3,13 @@ AUX imaging-1.1.6-missing-math.patch 717 RMD160 8e74a10a8925e93bbf9f7cad25e98d29
 AUX imaging-1.1.6-no-xv.patch 396 RMD160 4f7436c38864d81c452f548efbb89203855de4bc SHA1 73ffaaa071b72ae3e992f1ac2d425d085cb70408 SHA256 5c4ea77e029e609d7785d52f362805d8beb711d48fac3025e836c98fa670d4ea
 AUX imaging-1.1.6-sane.patch 401 RMD160 11fe942260f5084c22ce1f3d526ba39bcee8faaa SHA1 64fbec2a3621f086d0907c9c1ce50743fd548839 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c576598166718a2594763e1e1dbf55
 AUX imaging-1.1.6-tiffendian.patch 1520 RMD160 3f8044fa191fa9fc3eb7b47fb0910d5f2adfbf8d SHA1 34781c005866cc6a8606ced80c9e54c710dd3486 SHA256 ceab8d51281f1227e4227c555c2c40469e0da5fc706c2f2175ebd6a40a182e1e
+AUX imaging-1.1.7-giftrans.patch 530 RMD160 dd671761f9ab3cf9407f506b602ae63fbf5ea917 SHA1 ca83d2ab1ddf600528638c3702bd78c600ad4d43 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f
+AUX imaging-1.1.7-missing-math.patch 717 RMD160 8e74a10a8925e93bbf9f7cad25e98d29d60852bc SHA1 0492077180017b9d3878cd001780ddd2ec836eb1 SHA256 9bce95374278416d183a7a5dd67de7d4b0c4e98bb7ee61dc29821a9fe2ae3a15
+AUX imaging-1.1.7-no-xv.patch 691 RMD160 4469847faf7e380421715f985a4b9a98a874417f SHA1 b66c55a7dc10e1df78bc99d0a9eb497e97bec6b9 SHA256 d692f9085fefb06559ee63628852ce72a498657bccdd3ba500e8278ae22b145a
+AUX imaging-1.1.7-sane.patch 401 RMD160 11fe942260f5084c22ce1f3d526ba39bcee8faaa SHA1 64fbec2a3621f086d0907c9c1ce50743fd548839 SHA256 9d6bc8d5134bdaa199bc39e793a46dad42c576598166718a2594763e1e1dbf55
 DIST Imaging-1.1.6.tar.gz 435854 RMD160 336bb92482eb833e5bb1c9e8c1e585c9bdc338d1 SHA1 952d241e4af8ba09f74e6926108b7c0c748d0f89 SHA256 7dd7358ab519161967c838df27465282d180a3206f693ba2db64273d688b3f90
+DIST Imaging-1.1.7.tar.gz 498749 RMD160 9af570fe100e250a4860314341fe3e6d695d7fde SHA1 76c37504251171fda8da8e63ecb8bc42a69a5c81 SHA256 895bc7c2498c8e1f9b99938f1a40dc86b3f149741f105cf7c7bd2e0725405211
 EBUILD imaging-1.1.6-r1.ebuild 2286 RMD160 4f7aaf6fa9aaaafe92565bb434df71d0691c2058 SHA1 4edaff59e149d1b58a4a6f88788692f037c94cba SHA256 e17958b4d01f8556e9d148963b9be157ee475ae6ad74d2a8101a6a38294a59a4
-MISC ChangeLog 9620 RMD160 80d49b9f909641dcf3bfdb3b7143221fe919c430 SHA1 4dbd4761254845886ee938a1d0bdf7eec8cd360d SHA256 9d01a219702300e8f8de5cf620c327ecabb3e8cec1de704eba04b2c6f6eaaa78
+EBUILD imaging-1.1.7.ebuild 2209 RMD160 ef41ac055e942d15f9f333b9c048892169096067 SHA1 1d25b5dfed83e13bea572595aae6467e77b865b2 SHA256 d9df3f44fd0f82d61dc5057df933ec69caa2d0ac3d7b8179741cd3d76517b37f
+MISC ChangeLog 9932 RMD160 31c8c5bd418a85893f0f646854b53b8df0a65e1d SHA1 3c8f5cab59d31656193ea7905a8d7ed6575bbea4 SHA256 95dfc7d44cc2b03345e70c23ba04dad4b7959ac3366e952f0519b17d63cecbfb
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/imaging/files/imaging-1.1.7-giftrans.patch b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch
new file mode 100644
index 000000000000..1a109d28eee0
--- /dev/null
+++ b/dev-python/imaging/files/imaging-1.1.7-giftrans.patch
@@ -0,0 +1,14 @@
+--- Imaging-1.1.6.orig/PIL/GifImagePlugin.py    2006-12-03 11:37:15.000000000 +0000
++++ Imaging-1.1.6/PIL/GifImagePlugin.py 2008-10-02 14:51:43.000000000 +0100
+@@ -352,6 +352,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):
diff --git a/dev-python/imaging/files/imaging-1.1.7-missing-math.patch b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch
new file mode 100644
index 000000000000..f4d6167eeccc
--- /dev/null
+++ b/dev-python/imaging/files/imaging-1.1.7-missing-math.patch
@@ -0,0 +1,20 @@
+--- setup.py.old	2009-07-03 11:34:59.141671252 +0200
++++ setup.py	2009-07-03 11:51:54.415666711 +0200
+@@ -281,6 +281,8 @@ class pil_build_ext(build_ext):
+         if struct.unpack("h", "\0\1")[0] == 1:
+             defs.append(("WORDS_BIGENDIAN", None))
+ 
++        libs.append("m")
++
+         exts = [(Extension(
+             "_imaging", files, libraries=libs, define_macros=defs
+             ))]
+@@ -332,7 +334,7 @@ class pil_build_ext(build_ext):
+                 ))
+ 
+         if os.path.isfile("_imagingmath.c"):
+-            exts.append(Extension("_imagingmath", ["_imagingmath.c"]))
++            exts.append(Extension("_imagingmath", ["_imagingmath.c"], libraries=["m"]))
+ 
+         self.extensions[:] = exts
+ 
diff --git a/dev-python/imaging/files/imaging-1.1.7-no-xv.patch b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch
new file mode 100644
index 000000000000..1cbaf515bd4a
--- /dev/null
+++ b/dev-python/imaging/files/imaging-1.1.7-no-xv.patch
@@ -0,0 +1,18 @@
+--- PIL/ImageShow.py.old	2009-11-30 10:28:37.000000000 +0100
++++ PIL/ImageShow.py	2009-11-30 10:29:02.000000000 +0100
+@@ -149,13 +149,10 @@
+         def get_command_ex(self, file, title=None, **options):
+             # note: xv is pretty outdated.  most modern systems have
+             # imagemagick's display command instead.
+-            command = executable = "xv"
+-            if title:
+-                # FIXME: do full escaping
+-                command = command + " -name \"%s\"" % title
++            command = executable = "xdg-open"
+             return command, executable
+ 
+-    if which("xv"):
++    if which("xdg-open"):
+         register(XVViewer)
+ 
+ if __name__ == "__main__":
diff --git a/dev-python/imaging/files/imaging-1.1.7-sane.patch b/dev-python/imaging/files/imaging-1.1.7-sane.patch
new file mode 100644
index 000000000000..4970e50033a4
--- /dev/null
+++ b/dev-python/imaging/files/imaging-1.1.7-sane.patch
@@ -0,0 +1,13 @@
+--- Imaging-1.1.6/Sane/_sane.c.orig	2006-12-03 13:12:22.000000000 +0100
++++ Imaging-1.1.6/Sane/_sane.c	2009-02-28 11:41:19.000000000 +0200
+@@ -1152,8 +1152,8 @@
+ static PyObject *
+ PySane_get_devices(PyObject *self, PyObject *args)
+ {
+-  SANE_Device **devlist;
+-  SANE_Device *dev;
++  const SANE_Device **devlist;
++  const SANE_Device *dev;
+   SANE_Status st;
+   PyObject *list;
+   int local_only, i;
diff --git a/dev-python/imaging/imaging-1.1.7.ebuild b/dev-python/imaging/imaging-1.1.7.ebuild
new file mode 100644
index 000000000000..ce194b9ffd42
--- /dev/null
+++ b/dev-python/imaging/imaging-1.1.7.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 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.ebuild,v 1.1 2009/11/30 09:42:33 djc Exp $
+
+EAPI="2"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils distutils
+
+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="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc examples scanner tk X"
+
+DEPEND="media-libs/jpeg
+	media-libs/freetype:2
+	tk? ( dev-lang/python[tk?] )
+	scanner? ( media-gfx/sane-backends )
+	X? ( x11-misc/xdg-utils )"
+RDEPEND="${DEPEND}"
+
+RESTRICT_PYTHON_ABIS="3*"
+
+PYTHON_MODNAME=PIL
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-xv.patch
+	epatch "${FILESDIR}"/${P}-sane.patch
+	epatch "${FILESDIR}"/${P}-giftrans.patch
+	epatch "${FILESDIR}"/${P}-missing-math.patch
+	sed -i \
+		-e "s:/usr/lib\":/usr/$(get_libdir)\":" \
+		-e "s:\"lib\":\"$(get_libdir)\":g" \
+		setup.py || die "sed failed"
+	if ! use tk; then
+		# Make the test always fail
+		sed -i \
+			-e 's/import _tkinter/raise ImportError/' \
+			setup.py || die "sed failed"
+	fi
+}
+
+src_compile() {
+	distutils_src_compile
+	if use scanner; then
+		cd "${S}/Sane"
+		distutils_src_compile
+	fi
+}
+
+src_test() {
+	tests() {
+		PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "${python}" selftest.py
+	}
+	python_execute_function tests
+}
+
+src_install() {
+	local DOCS="CHANGES CONTENTS"
+	distutils_src_install
+
+	use doc && dohtml Docs/*
+
+	if use scanner; then
+		cd "${S}/Sane"
+		docinto sane
+		local DOCS="CHANGES sanedoc.txt"
+		distutils_src_install
+		cd "${S}"
+	fi
+
+	# Install headers required by media-gfx/sketch.
+	install_headers() {
+		insinto "$(python_get_includedir)"
+		doins libImaging/Imaging.h
+		doins libImaging/ImPlatform.h
+	}
+	python_execute_function install_headers
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins Scripts/*
+		if use scanner; then
+			insinto /usr/share/doc/${PF}/examples/sane
+			doins Sane/demo_*.py
+		fi
+	fi
+}