fix for compilation bug with new tk

4 files changed, 60 insertions, 3 deletions

diff --git a/dev-python/Imaging/ChangeLog b/dev-python/Imaging/ChangeLog
index b2eb2b745d18..5def1b62b9b4 100644
--- a/dev-python/Imaging/ChangeLog
+++ b/dev-python/Imaging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/Imaging
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/ChangeLog,v 1.9 2003/03/25 21:21:00 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/ChangeLog,v 1.10 2003/05/16 20:38:43 liquidx Exp $
+
+*Imaging-1.1.3-r2 (16 May 2003)
+
+  16 May 2003; Alastair Tse <liquidx@gentoo.org> Imaging-1.1.3-r2.ebuild:
+  workaround for new tk-8.4.x. thanks to Hyriand <hyriand@thegraveyard.org>
+  (#21013)
 
 *Imaging-1.1.3-r1 (05 Mar 2003)
 
diff --git a/dev-python/Imaging/Imaging-1.1.3-r2.ebuild b/dev-python/Imaging/Imaging-1.1.3-r2.ebuild
new file mode 100644
index 000000000000..85d7b624bd2e
--- /dev/null
+++ b/dev-python/Imaging/Imaging-1.1.3-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/Imaging/Imaging-1.1.3-r2.ebuild,v 1.1 2003/05/16 20:38:43 liquidx Exp $ 
+
+inherit distutils
+
+IUSE="tcltk"
+
+DESCRIPTION="Python Imaging Library (PIL)."
+SRC_URI="http://www.pythonware.com/downloads/${P}.tar.gz"
+HOMEPAGE="http://www.pythonware.com/downloads/#pil"
+
+DEPEND=">=media-libs/jpeg-6a
+	>=sys-libs/zlib-0.95
+	tcltk? ( dev-lang/tk )"
+	
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha ~ppc"
+LICENSE="as-is"
+
+ src_compile() {
+	export OPT=${CFLAGS}
+
+	#Build the core imaging library (libImaging.a)
+	cd ${S}/libImaging
+	econf
+	cp Makefile Makefile.orig
+
+	#Not configured by configure
+	sed \
+    	-e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \
+	Makefile.orig > Makefile
+	emake || die
+	cd ${S}
+	CFLAGS="$(CFLAGS) -DUSE_COMPOSITELESS_PHOTO_PUT_BLOCK" distutils_src_compile
+}
+
+src_install () 
+{
+	local mydoc="CHANGES* CONTENTS"
+	distutils_src_install
+    distutils_python_version
+
+	# install headers required by media-gfx/sketch
+	insinto "${ROOT}/usr/include/python${PYVER}"
+	doins libImaging/Imaging.h
+	doins libImaging/ImPlatform.h
+	doins libImaging/ImConfig.h
+}
+
diff --git a/dev-python/Imaging/Manifest b/dev-python/Imaging/Manifest
index b049422ff210..e8782703a659 100644
--- a/dev-python/Imaging/Manifest
+++ b/dev-python/Imaging/Manifest
@@ -1,8 +1,8 @@
-MD5 83d5edff2f7fbcb8ac03f835526a1ba2 ChangeLog 1427
+MD5 af6512f962b0660627541b47531633a9 ChangeLog 1623
 MD5 2107be6b97f6baf17de8912fb33dbd58 Imaging-1.1.2-r2.ebuild 2635
 MD5 3bfb01b27006db5011528dde77d1c4b7 Imaging-1.1.3.ebuild 2642
 MD5 c4ea597c981653efae62201e5364db7c Imaging-1.1.3-r1.ebuild 1179
-MD5 9054c5354dd168117ae335b257e9fecf Imaging-1.1.3-r2.ebuild 1234
+MD5 9b994e52a09bd9e7dac00bec71a8c9fe Imaging-1.1.3-r2.ebuild 1235
 MD5 7e1eafa229aad0303d6d04c88c1f89e6 files/digest-Imaging-1.1.2-r2 65
 MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3 65
 MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-Imaging-1.1.3-r1 65
diff --git a/dev-python/Imaging/files/digest-Imaging-1.1.3-r2 b/dev-python/Imaging/files/digest-Imaging-1.1.3-r2
new file mode 100644
index 000000000000..9f6f98af43e5
--- /dev/null
+++ b/dev-python/Imaging/files/digest-Imaging-1.1.3-r2
@@ -0,0 +1 @@
+MD5 563471981376e06b3278ad713a07e2a8 Imaging-1.1.3.tar.gz 346194