stable x86 bump and cleanup

Package-Manager: portage-2.1_pre3-r1

13 files changed, 13 insertions, 434 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index d974317dcd7d..52909cbf1cef 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/imaging
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.21 2006/02/06 03:00:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.22 2006/02/06 21:22:36 liquidx Exp $
+
+  06 Feb 2006; Alastair Tse <liquidx@gentoo.org> -imaging-1.1.2-r2.ebuild,
+  -imaging-1.1.3.ebuild, -imaging-1.1.3-r1.ebuild, -imaging-1.1.3-r2.ebuild,
+  -imaging-1.1.4.ebuild, imaging-1.1.5.ebuild:
+  stable x86 bump and cleanup
 
   06 Feb 2006; Aron Griffis <agriffis@gentoo.org> imaging-1.1.5.ebuild:
   Mark 1.1.5 stable on alpha
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index 8e0971253199..58a8b746ee98 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -1,67 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 15de1eac86534c315d938085e606a087 ChangeLog 5591
-RMD160 fe755943da02a788a02b6c98a1f4d6b0ca7cffd5 ChangeLog 5591
-SHA256 82025a02e9df3079ee927e2fc9f1884809d96265c9b59b9020e03d9a5fcaccbd ChangeLog 5591
-MD5 7e1eafa229aad0303d6d04c88c1f89e6 files/digest-imaging-1.1.2-r2 65
-RMD160 f6a299f5faf1ab257f47c3c9826dbca89298f026 files/digest-imaging-1.1.2-r2 65
-SHA256 4e50a788c2a797a23fb6727ffa17cb4b9885ac4cf4eb78398a62441569623704 files/digest-imaging-1.1.2-r2 65
-MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-imaging-1.1.3 65
-RMD160 16c5add6bcdb068b947abd97554a8164873042ff files/digest-imaging-1.1.3 65
-SHA256 cb70f8ab253fbd511c955487e4e17fc9159f5920b7609776933ca7fbe74018e0 files/digest-imaging-1.1.3 65
-MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-imaging-1.1.3-r1 65
-RMD160 16c5add6bcdb068b947abd97554a8164873042ff files/digest-imaging-1.1.3-r1 65
-SHA256 cb70f8ab253fbd511c955487e4e17fc9159f5920b7609776933ca7fbe74018e0 files/digest-imaging-1.1.3-r1 65
-MD5 a7c02afc37ec55a40b4369ace30d8fdb files/digest-imaging-1.1.3-r2 65
-RMD160 16c5add6bcdb068b947abd97554a8164873042ff files/digest-imaging-1.1.3-r2 65
-SHA256 cb70f8ab253fbd511c955487e4e17fc9159f5920b7609776933ca7fbe74018e0 files/digest-imaging-1.1.3-r2 65
-MD5 171777970922938dc6a815dd2b6a85de files/digest-imaging-1.1.4 65
-RMD160 119ecd2070b3d46e8972f92d2fc943f538ad0f65 files/digest-imaging-1.1.4 65
-SHA256 854900b37a8975f7e36e8a7a17dd23604415ef184cb73a4f8a5f09872e85e19d files/digest-imaging-1.1.4 65
+MD5 f314b5f6f6a26cefec3e26d96376ea14 ChangeLog 5820
 MD5 171777970922938dc6a815dd2b6a85de files/digest-imaging-1.1.4-r1 65
-RMD160 119ecd2070b3d46e8972f92d2fc943f538ad0f65 files/digest-imaging-1.1.4-r1 65
-SHA256 854900b37a8975f7e36e8a7a17dd23604415ef184cb73a4f8a5f09872e85e19d files/digest-imaging-1.1.4-r1 65
 MD5 8346ef95317c4950102042d8683c0553 files/digest-imaging-1.1.5 241
-RMD160 64f685b129d769ca6cdd2ba68863f0629270077e files/digest-imaging-1.1.5 241
-SHA256 9d7a1bfb7133116b591040d4e0f076b6cb9e403b0702ce62a179d02415c2bf32 files/digest-imaging-1.1.5 241
 MD5 8f3dd92ea003765c3f18202e3ee6be14 files/imaging-1.1.4-fPIC.patch 373
-RMD160 8d9159c4594eecbeac93742cb5cee84f827d1c35 files/imaging-1.1.4-fPIC.patch 373
-SHA256 f0eed7ebfd1067eab0afd132f2f99f796c6135aff560ddb469431b641a52fcd2 files/imaging-1.1.4-fPIC.patch 373
 MD5 e937d8e178744db225745000b4e42128 files/imaging-1.1.4-ft-2.1.9.patch 301
-RMD160 deb194723d754fd20815a5e6d7805bf5a02ec264 files/imaging-1.1.4-ft-2.1.9.patch 301
-SHA256 907e5d177d89446a30166c3f8fe9422063b9cbe7b5278a19722f2284925de908 files/imaging-1.1.4-ft-2.1.9.patch 301
 MD5 d0b3528fb0e74be99cf9ac5e9372e317 files/imaging-1.1.4-setup.py.patch 374
-RMD160 48b1941ce8e0209c864da302159aeeee07ace186 files/imaging-1.1.4-setup.py.patch 374
-SHA256 ddd52f034837a7d8fcc225126b1063673e9439ac5d1b91355d4527b32453a3ce files/imaging-1.1.4-setup.py.patch 374
-MD5 49932cad00d3e7633bfc27c52c1663f5 imaging-1.1.2-r2.ebuild 2675
-RMD160 be950b840b635f3c071ea9b3679164b5db93df4a imaging-1.1.2-r2.ebuild 2675
-SHA256 90bb8b5e81f5ad70adba709c1b496b75942d21490e509e02c434bfa90a23ae58 imaging-1.1.2-r2.ebuild 2675
-MD5 97b3f8a53ac6b8b6a6e7c3f2083cb8ad imaging-1.1.3-r1.ebuild 1280
-RMD160 81a942a7690e0832100c6d0f7faa6467ee6d163c imaging-1.1.3-r1.ebuild 1280
-SHA256 71f31c010141073f3d91f56c1f89a91ffe7438fc6dbb6d092ac08f5ed2d1760f imaging-1.1.3-r1.ebuild 1280
-MD5 0d7e51a402015d9e3ee03c166109fab7 imaging-1.1.3-r2.ebuild 1334
-RMD160 b1a4cfe3c9dc4f71267f451437c28ba68d973a27 imaging-1.1.3-r2.ebuild 1334
-SHA256 4163e3d5d97ff99d0f2600ba0dafdf5f459c5309f2bbcf3f6032d6a13d0cee54 imaging-1.1.3-r2.ebuild 1334
-MD5 eff4ab65622885554082eef13071ed27 imaging-1.1.3.ebuild 2672
-RMD160 6439ed8ba68249d2ae9624ee39bedf257616ca1d imaging-1.1.3.ebuild 2672
-SHA256 454e010085e53c421dc6f5d417d117348ac83c4f1fd6ffe9875979c3da3e86f0 imaging-1.1.3.ebuild 2672
 MD5 348cf7ff1984552bb48a1ee8791fd83c imaging-1.1.4-r1.ebuild 1430
-RMD160 1f777bd64983631408217f37716b3dd93df9e5ea imaging-1.1.4-r1.ebuild 1430
-SHA256 576e519682c9196e021a7722662f82027f015360e055080b6293aaab0e9c03ef imaging-1.1.4-r1.ebuild 1430
-MD5 11f5da5f34dca45b7ac112e40ee1c8af imaging-1.1.4.ebuild 1419
-RMD160 231c53daf1633ebc04281e44426edf83d4238bbe imaging-1.1.4.ebuild 1419
-SHA256 5c3ebee0b94e8004c07000892c95ecee46e653888b696b413cf05b0b9518d6cf imaging-1.1.4.ebuild 1419
-MD5 1ba744a8ddaee74d3b8f82169ecaf8eb imaging-1.1.5.ebuild 1471
-RMD160 52d3d1e4149132294d235f7cb656a361c6996314 imaging-1.1.5.ebuild 1471
-SHA256 3d1c23a3d7bd00025e72cc7fc942257a5018d88066f1d7830961cc68ab709483 imaging-1.1.5.ebuild 1471
+MD5 3f0e607787cf021e55558c936219a769 imaging-1.1.5.ebuild 1469
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
-SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 metadata.xml 159
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD5rvYJrHF4yAQTrARAn/wAJ9EO+siStu9uvMcmojc9HljJHh3ngCfVqCI
-24e2z1zr2vNg53NfHOT1fe4=
-=MHLu
+iD8DBQFD575B9ZFPrqoILX8RAuWeAKDmBAAmg8sraQcqaPmWynA46wGTPgCeKWRG
+54xca16BuxjijFt0fhgAmQg=
+=Jczp
 -----END PGP SIGNATURE-----
diff --git a/dev-python/imaging/files/digest-imaging-1.1.2-r2 b/dev-python/imaging/files/digest-imaging-1.1.2-r2
deleted file mode 100644
index 3f725028aad7..000000000000
--- a/dev-python/imaging/files/digest-imaging-1.1.2-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a17e1a769c7cfbd0ca0b358aa96ecd05 Imaging-1.1.2.tar.gz 336739
diff --git a/dev-python/imaging/files/digest-imaging-1.1.3 b/dev-python/imaging/files/digest-imaging-1.1.3
deleted file mode 100644
index 9f6f98af43e5..000000000000
--- a/dev-python/imaging/files/digest-imaging-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 563471981376e06b3278ad713a07e2a8 Imaging-1.1.3.tar.gz 346194
diff --git a/dev-python/imaging/files/digest-imaging-1.1.3-r1 b/dev-python/imaging/files/digest-imaging-1.1.3-r1
deleted file mode 100644
index 9f6f98af43e5..000000000000
--- a/dev-python/imaging/files/digest-imaging-1.1.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 563471981376e06b3278ad713a07e2a8 Imaging-1.1.3.tar.gz 346194
diff --git a/dev-python/imaging/files/digest-imaging-1.1.3-r2 b/dev-python/imaging/files/digest-imaging-1.1.3-r2
deleted file mode 100644
index 9f6f98af43e5..000000000000
--- a/dev-python/imaging/files/digest-imaging-1.1.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 563471981376e06b3278ad713a07e2a8 Imaging-1.1.3.tar.gz 346194
diff --git a/dev-python/imaging/files/digest-imaging-1.1.4 b/dev-python/imaging/files/digest-imaging-1.1.4
deleted file mode 100644
index 9ed5eedc0531..000000000000
--- a/dev-python/imaging/files/digest-imaging-1.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2c03c25a9a0128832137dd536da88da Imaging-1.1.4.tar.gz 416338
diff --git a/dev-python/imaging/imaging-1.1.2-r2.ebuild b/dev-python/imaging/imaging-1.1.2-r2.ebuild
deleted file mode 100644
index e2585ffabefc..000000000000
--- a/dev-python/imaging/imaging-1.1.2-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.2-r2.ebuild,v 1.4 2005/04/01 18:12:49 blubb Exp $
-
-MY_P=${P/imaging/Imaging}
-S=${WORKDIR}/${MY_P}
-
-IUSE="X tcltk"
-
-DESCRIPTION="Python Imaging Library (PIL)."
-SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pythonware.com/downloads/#pil"
-
-DEPEND=">=dev-lang/python-2.0
-	>=media-libs/jpeg-6a
-	>=sys-libs/zlib-0.95
-	>=media-libs/freetype-2.1.5
-	tcltk? ( dev-lang/tk )
-	X? ( media-gfx/xv )"
-
-SLOT="0"
-KEYWORDS="x86 sparc alpha ppc"
-LICENSE="as-is"
-
-src_compile() {
-	#This is a goofy build.
-
-	#Build the core imaging library (libImaging.a)
-	cd ${S}/libImaging
-
-	./configure --prefix=/usr \
-		--host=${CHOST} || die
-	cp Makefile Makefile.orig
-
-	#Not configured by configure
-	sed \
-		-e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \
-		-e "s:\(OPT=[[:blank:]]*\).*:\1${CFLAGS}:" \
-	Makefile.orig > Makefile
-
-	emake || die
-
-	#Build loadable python modules
-	cd ${S}
-
-	local scmd=""
-
-	#First change all the "/usr/local" to "/usr"
-	scmd="$scmd s:/usr/local:/usr:g;"
-
-	# adjust for USE tcltk
-	if use tcltk; then
-		# Find the version of tcl/tk that has headers installed.
-		# This will be the most recently merged, not necessarily the highest
-		# version number.
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-		# adjust Setup to match
-		scmd="$scmd s/-ltcl[0-9.]* -ltk[0-9.]*/-ltcl$tclv -ltk$tkv/;"
-	else
-		scmd="$scmd s:\(^_imagingtk\):#\1:;"
-	fi
-
-	sed "$scmd" Setup.in > Setup
-
-	#No configure (#$%@!%%)
-	scmd=""
-	cp Makefile.pre.in Makefile.pre.in.orig
-	#change all the "/usr/local" to "/usr" (haven't we been here before)
-	scmd="$scmd s:/usr/local:/usr:g;"
-	#fix man paths
-	scmd="$scmd "'s:^\(MANDIR=.*/\)\(man\):\1share/\2:;'
-	#Insert make.conf CFLAGS settings
-	scmd="$scmd "'s:$(OPT)'":${CFLAGS}:;"
-
-	sed "$scmd" Makefile.pre.in.orig > Makefile.pre.in
-
-	#Now generate a top level Makefile
-	make -f Makefile.pre.in boot || die
-
-	emake || die
-}
-
-src_install () {
-	#grab python verision so ebuild doesn't depend on it
-	local pv
-	pv=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
-
-
-	insinto /usr/lib/python$pv/site-packages
-	doins PIL.pth
-
-	insinto /usr/lib/python$pv/site-packages/PIL
-	doins _imaging.so PIL/*
-	use tcltk && doins _imagingtk.so
-
-	# install headers required by media-gfx/sketch
-	insinto /usr/include/python$pv
-	doins libImaging/Imaging.h
-	doins libImaging/ImPlatform.h
-	doins libImaging/ImConfig.h
-
-	dodoc CHANGES CONTENTS FORMATS README
-}
diff --git a/dev-python/imaging/imaging-1.1.3-r1.ebuild b/dev-python/imaging/imaging-1.1.3-r1.ebuild
deleted file mode 100644
index 241a9390b5af..000000000000
--- a/dev-python/imaging/imaging-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.3-r1.ebuild,v 1.4 2005/04/01 18:12:49 blubb Exp $
-
-inherit distutils
-
-MY_P=${P/imaging/Imaging}
-S=${WORKDIR}/${MY_P}
-
-IUSE="X tcltk"
-
-DESCRIPTION="Python Imaging Library (PIL)."
-SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pythonware.com/downloads/#pil"
-
-DEPEND=">=media-libs/jpeg-6a
-	>=sys-libs/zlib-0.95
-	>=media-libs/freetype-2.1.5
-	tcltk? ( dev-lang/tk )
-	X? ( media-gfx/xv )"
-
-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 || die "econf failed"
-	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}
-	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/imaging-1.1.3-r2.ebuild b/dev-python/imaging/imaging-1.1.3-r2.ebuild
deleted file mode 100644
index a6903fec376f..000000000000
--- a/dev-python/imaging/imaging-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# 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.5 2005/04/01 18:12:49 blubb Exp $
-
-inherit distutils
-
-MY_P=${P/imaging/Imaging}
-S=${WORKDIR}/${MY_P}
-
-IUSE="X tcltk"
-
-DESCRIPTION="Python Imaging Library (PIL)."
-SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pythonware.com/downloads/#pil"
-
-DEPEND=">=media-libs/jpeg-6a
-	>=sys-libs/zlib-0.95
-	>=media-libs/freetype-2.1.5
-	tcltk? ( dev-lang/tk )
-	X? ( media-gfx/xv )"
-
-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 || die "econf failed"
-	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/imaging-1.1.3.ebuild b/dev-python/imaging/imaging-1.1.3.ebuild
deleted file mode 100644
index 7b39f50c461b..000000000000
--- a/dev-python/imaging/imaging-1.1.3.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.3.ebuild,v 1.4 2005/04/01 18:12:49 blubb Exp $
-
-IUSE="X tcltk"
-
-MY_P=${P/imaging/Imaging}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Python Imaging Library (PIL)."
-SRC_URI="http://www.pythonware.net/storage/${MY_P}.tar.gz"
-HOMEPAGE="http://www.pythonware.com/downloads/#pil"
-
-DEPEND=">=dev-lang/python-2.0
-	>=media-libs/jpeg-6a
-	>=sys-libs/zlib-0.95
-	>=media-libs/freetype-2.1.5
-	tcltk? ( dev-lang/tk )
-	X? ( media-gfx/xv )"
-
-
-SLOT="0"
-KEYWORDS="x86 sparc alpha ppc"
-LICENSE="as-is"
-
-src_compile() {
-	#This is a goofy build.
-
-	#Build the core imaging library (libImaging.a)
-	cd ${S}/libImaging
-
-	./configure --prefix=/usr \
-		--host=${CHOST} || die
-	cp Makefile Makefile.orig
-
-	#Not configured by configure
-	sed \
-		-e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \
-		-e "s:\(OPT=[[:blank:]]*\).*:\1${CFLAGS}:" \
-	Makefile.orig > Makefile
-
-	emake || die
-
-	#Build loadable python modules
-	cd ${S}
-
-	local scmd=""
-
-	#First change all the "/usr/local" to "/usr"
-	scmd="$scmd s:/usr/local:/usr:g;"
-
-	# adjust for USE tcltk
-	if use tcltk; then
-		# Find the version of tcl/tk that has headers installed.
-		# This will be the most recently merged, not necessarily the highest
-		# version number.
-		tclv=$(grep TCL_VER /usr/include/tcl.h | sed 's/^.*"\(.*\)".*/\1/')
-		tkv=$( grep  TK_VER /usr/include/tk.h  | sed 's/^.*"\(.*\)".*/\1/')
-		# adjust Setup to match
-		scmd="$scmd s/-ltcl[0-9.]* -ltk[0-9.]*/-ltcl$tclv -ltk$tkv/;"
-	else
-		scmd="$scmd s:\(^_imagingtk\):#\1:;"
-	fi
-
-	sed "$scmd" Setup.in > Setup
-
-	#No configure (#$%@!%%)
-	scmd=""
-	cp Makefile.pre.in Makefile.pre.in.orig
-	#change all the "/usr/local" to "/usr" (haven't we been here before)
-	scmd="$scmd s:/usr/local:/usr:g;"
-	#fix man paths
-	scmd="$scmd "'s:^\(MANDIR=.*/\)\(man\):\1share/\2:;'
-	#Insert make.conf CFLAGS settings
-	scmd="$scmd "'s:$(OPT)'":${CFLAGS}:;"
-
-	sed "$scmd" Makefile.pre.in.orig > Makefile.pre.in
-
-	#Now generate a top level Makefile
-	make -f Makefile.pre.in boot || die
-
-	emake || die
-}
-
-src_install () {
-	#grab python verision so ebuild doesn't depend on it
-	local pv
-	pv=$(python -V 2>&1 | sed -e 's:Python \([0-9].[0-9]\).*:\1:')
-
-	insinto /usr/lib/python$pv/site-packages
-	doins PIL.pth
-
-	insinto /usr/lib/python$pv/site-packages/PIL
-	doins _imaging.so PIL/*
-	use tcltk && doins _imagingtk.so
-
-	# install headers required by media-gfx/sketch
-	insinto /usr/include/python$pv
-	doins libImaging/Imaging.h
-	doins libImaging/ImPlatform.h
-	doins libImaging/ImConfig.h
-
-	dodoc CHANGES CONTENTS FORMATS README
-}
diff --git a/dev-python/imaging/imaging-1.1.4.ebuild b/dev-python/imaging/imaging-1.1.4.ebuild
deleted file mode 100644
index 1e56576bf2d0..000000000000
--- a/dev-python/imaging/imaging-1.1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.4.ebuild,v 1.8 2005/04/01 18:12:49 blubb Exp $
-
-inherit distutils eutils
-
-MY_P=${P/imaging/Imaging}
-S=${WORKDIR}/${MY_P}
-
-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="x86 ~ppc sparc alpha amd64"
-IUSE="X tcltk"
-
-DEPEND="virtual/python
-	>=media-libs/jpeg-6a
-	>=sys-libs/zlib-0.95
-	>=media-libs/freetype-2.1.5
-	tcltk? ( dev-lang/tk )
-	X? ( media-gfx/xv )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-setup.py.patch
-	epatch ${FILESDIR}/${P}-fPIC.patch
-	epatch ${FILESDIR}/${P}-ft-2.1.9.patch
-}
-
-src_compile() {
-	export OPT=${CFLAGS}
-
-	#Build the core imaging library (libImaging.a)
-	cd ${S}/libImaging
-	econf || die "econf failed"
-	#Not configured by configure
-	sed -e "s:\(JPEGINCLUDE=[[:blank:]]*/usr/\)local/\(include\).*:\1\2:" \
-		-i Makefile
-	emake || die
-	cd ${S}; 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/imaging-1.1.5.ebuild b/dev-python/imaging/imaging-1.1.5.ebuild
index 28ca1291c748..ebcb822ccf38 100644
--- a/dev-python/imaging/imaging-1.1.5.ebuild
+++ b/dev-python/imaging/imaging-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.5.ebuild,v 1.5 2006/02/06 03:00:31 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.5.ebuild,v 1.6 2006/02/06 21:22:36 liquidx Exp $
 
 inherit distutils eutils multilib
 
@@ -13,7 +13,7 @@ SRC_URI="http://www.effbot.org/downloads/${MY_P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X tcltk scanner doc"
 
 DEPEND="virtual/python