Delete older ebuild.

Package-Manager: portage-2.2.0_alpha2_p2/cvs/Linux x86_64

8 files changed, 8 insertions, 205 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index 2417d0ef7b79..06df12e02f5a 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/imaging
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.58 2010/03/07 12:51:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.59 2010/10/30 23:06:27 arfrever Exp $
+
+  30 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -imaging-1.1.6-r1.ebuild, -files/imaging-1.1.6-giftrans.patch,
+  -files/imaging-1.1.6-missing-math.patch, -files/imaging-1.1.6-no-xv.patch,
+  -files/imaging-1.1.6-sane.patch, -files/imaging-1.1.6-tiffendian.patch:
+  Delete.
 
   07 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> imaging-1.1.7.ebuild:
   amd64 stable wrt #298979
diff --git a/dev-python/imaging/Manifest b/dev-python/imaging/Manifest
index b8383e563f61..470941bf2b74 100644
--- a/dev-python/imaging/Manifest
+++ b/dev-python/imaging/Manifest
@@ -1,15 +1,8 @@
-AUX imaging-1.1.6-giftrans.patch 530 RMD160 dd671761f9ab3cf9407f506b602ae63fbf5ea917 SHA1 ca83d2ab1ddf600528638c3702bd78c600ad4d43 SHA256 70af27dc98f63bb3e625685ba82e6660f7b605453a1f995e4ca420af49c49c6f
-AUX imaging-1.1.6-missing-math.patch 717 RMD160 8e74a10a8925e93bbf9f7cad25e98d29d60852bc SHA1 0492077180017b9d3878cd001780ddd2ec836eb1 SHA256 9bce95374278416d183a7a5dd67de7d4b0c4e98bb7ee61dc29821a9fe2ae3a15
-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 c6f451386765a8a4fe3bcf4eb0329797943f329f SHA1 b14a483fdcf8230e29d77170ca6ed1f4f7d13b5b SHA256 a6aca66e4b07eebdf03d193ff49bd4aa35a600da9ce40e531bf378e6d9859bd3
 EBUILD imaging-1.1.7.ebuild 2208 RMD160 90368caea008f7facacafe9e088ba4e796129618 SHA1 2cd4fd4627de09581e0036bed14c2178bc3022bf SHA256 2f2f076dfdceaceb71912fcc143c9610649e99006adc82278cdf88d3a60dba20
-MISC ChangeLog 10545 RMD160 e209c44e9cd882554bdbd44ee78986a2f117484a SHA1 d24ec6c4f9dbdc05fe72c65946ea8af3f1ba7721 SHA256 413c11a1bb9a3107079373623c01edafe4a35a1b70ae704672ce98233b379323
+MISC ChangeLog 10844 RMD160 1040b0712ae51f8f4b549f89b967e490196e2364 SHA1 a465111186dca1300a45f6b90e29604769b01771 SHA256 54bffa77e420b31c32dfe6f1568ab02ee8b72511ed2bb6a7673e1336e6d1c0e7
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/imaging/files/imaging-1.1.6-giftrans.patch b/dev-python/imaging/files/imaging-1.1.6-giftrans.patch
deleted file mode 100644
index 1a109d28eee0..000000000000
--- a/dev-python/imaging/files/imaging-1.1.6-giftrans.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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.6-missing-math.patch b/dev-python/imaging/files/imaging-1.1.6-missing-math.patch
deleted file mode 100644
index f4d6167eeccc..000000000000
--- a/dev-python/imaging/files/imaging-1.1.6-missing-math.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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.6-no-xv.patch b/dev-python/imaging/files/imaging-1.1.6-no-xv.patch
deleted file mode 100644
index fef002193fd0..000000000000
--- a/dev-python/imaging/files/imaging-1.1.6-no-xv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- PIL/Image.py.orig	2009-03-20 18:19:52.184274983 +0000
-+++ PIL/Image.py	2009-03-20 18:20:48.605088504 +0000
-@@ -2065,9 +2065,7 @@
-     else:
-         format = None
-         if not command:
--            command = "xv"
--            if title:
--                command = command + " -name \"%s\"" % title
-+            command = "xdg-open"
- 
-     if image.mode == "I;16":
-         # @PIL88 @PIL101
diff --git a/dev-python/imaging/files/imaging-1.1.6-sane.patch b/dev-python/imaging/files/imaging-1.1.6-sane.patch
deleted file mode 100644
index 4970e50033a4..000000000000
--- a/dev-python/imaging/files/imaging-1.1.6-sane.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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/files/imaging-1.1.6-tiffendian.patch b/dev-python/imaging/files/imaging-1.1.6-tiffendian.patch
deleted file mode 100644
index 441725a7fe12..000000000000
--- a/dev-python/imaging/files/imaging-1.1.6-tiffendian.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- Imaging-1.1.6/PIL/Image.py.orig	2009-07-15 07:44:06.210499375 -0700
-+++ Imaging-1.1.6/PIL/Image.py	2009-07-15 07:47:38.546498713 -0700
-@@ -197,6 +197,7 @@
-     "1": ('|b1', None),
-     "L": ('|u1', None),
-     "I": ('%si4' % _ENDIAN, None), # FIXME: is this correct?
-+    "I;16": ('%si2' % _ENDIAN, None),
-     "F": ('%sf4' % _ENDIAN, None), # FIXME: is this correct?
-     "P": ('|u1', None),
-     "RGB": ('|u1', 3),
---- Imaging-1.1.6/PIL/TiffImagePlugin.py.orig	2009-07-15 07:50:27.723535040 -0700
-+++ Imaging-1.1.6/PIL/TiffImagePlugin.py	2009-07-15 07:50:40.490496978 -0700
-@@ -577,10 +577,16 @@
-         xdpi = getscalar(X_RESOLUTION, (1, 1))
-         ydpi = getscalar(Y_RESOLUTION, (1, 1))
- 
--        if xdpi and ydpi and getscalar(RESOLUTION_UNIT, 1) == 1:
-+        if xdpi and ydpi:
-             xdpi = xdpi[0] / (xdpi[1] or 1)
-             ydpi = ydpi[0] / (ydpi[1] or 1)
--            self.info["dpi"] = xdpi, ydpi
-+            unit = getscalar(RESOLUTION_UNIT, 1)
-+            if unit == 1:
-+                self.info["aspect"] = xdpi, ydpi
-+            elif unit == 2:
-+                self.info["dpi"] = xdpi, ydpi
-+            elif unit == 3:
-+                self.info["dpi"] = (xdpi*.39370079, ydpi*.39370079)
- 
-         # build tile descriptors
-         x = y = l = 0
-@@ -718,7 +724,7 @@
- 
-     dpi = im.encoderinfo.get("dpi")
-     if dpi:
--        ifd[RESOLUTION_UNIT] = 1
-+        ifd[RESOLUTION_UNIT] = 2
-         ifd[X_RESOLUTION] = _cvt_res(dpi[0])
-         ifd[Y_RESOLUTION] = _cvt_res(dpi[1])
- 
diff --git a/dev-python/imaging/imaging-1.1.6-r1.ebuild b/dev-python/imaging/imaging-1.1.6-r1.ebuild
deleted file mode 100644
index 5edda1175b85..000000000000
--- a/dev-python/imaging/imaging-1.1.6-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-1.1.6-r1.ebuild,v 1.14 2010/02/06 14:50:12 arfrever 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 http://pypi.python.org/pypi/PIL"
-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}-tiffendian.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
-}