Drop GIF transparency patches.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 7 insertions, 42 deletions

diff --git a/dev-python/imaging/ChangeLog b/dev-python/imaging/ChangeLog
index b93ea9af812e..eed63dd04c4a 100644
--- a/dev-python/imaging/ChangeLog
+++ b/dev-python/imaging/ChangeLog
@@ -1,6 +1,11 @@
 # 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.86 2013/05/27 23:27:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/ChangeLog,v 1.87 2013/05/28 22:29:32 floppym Exp $
+
+  28 May 2013; Mike Gilbert <floppym@gentoo.org>
+  -files/imaging-2.0.0-GifImagePlugin.patch,
+  -files/imaging-2.0.0-gif_transparency.patch, imaging-2.0.0.ebuild:
+  Drop GIF transparency patches.
 
 *imaging-2.0.0 (27 May 2013)
 
diff --git a/dev-python/imaging/files/imaging-2.0.0-GifImagePlugin.patch b/dev-python/imaging/files/imaging-2.0.0-GifImagePlugin.patch
deleted file mode 100644
index e380db3a7803..000000000000
--- a/dev-python/imaging/files/imaging-2.0.0-GifImagePlugin.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit cb4f0f2b3c57a76551c7dfdae6a67f4b58da4681
-Author: Alex Clark <aclark@aclark.net>
-Date:   Wed Feb 6 09:25:03 2013 -0500
-
-    Revert "Fix saving images with added transparency"
-    
-    This reverts commit cc439099c1e8c81a929ea446caa6791d7d9b6bd6.
-
-diff --git a/PIL/GifImagePlugin.py b/PIL/GifImagePlugin.py
-index 2036893..443d4db 100644
---- a/PIL/GifImagePlugin.py
-+++ b/PIL/GifImagePlugin.py
-@@ -364,11 +364,6 @@ def getheader(im, palette=None, info=None):
-         for i in range(maxcolor):
-             s.append(o8(i) * 3)
- 
--    if im.info.has_key('transparency'):
--        transparentIndex = im.info['transparency']
--        s.append('!' + o8(0xf9) + o8(4) + o8(1) + o8(0) + o8(0) +
--                 o8(transparentIndex) + o8(0))
--
-     return s
- 
- def getdata(im, offset = (0, 0), **params):
diff --git a/dev-python/imaging/files/imaging-2.0.0-gif_transparency.patch b/dev-python/imaging/files/imaging-2.0.0-gif_transparency.patch
deleted file mode 100644
index 70cfc1d72a78..000000000000
--- a/dev-python/imaging/files/imaging-2.0.0-gif_transparency.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- PIL/GifImagePlugin.py
-+++ PIL/GifImagePlugin.py
-@@ -364,6 +364,11 @@
-         for i in range(maxcolor):
-             s.append(o8(i) * 3)
- 
-+    if im.info.has_key('transparency'):
-+        transparentIndex = im.info['transparency']
-+        s.append('!' + o8(0xf9) + o8(4) + o8(1) + o8(0) + o8(0) +
-+                 o8(transparentIndex) + o8(0))
-+
-     return s
- 
- def getdata(im, offset = (0, 0), **params):
diff --git a/dev-python/imaging/imaging-2.0.0.ebuild b/dev-python/imaging/imaging-2.0.0.ebuild
index 7a27bece2a7c..5ec8324f0179 100644
--- a/dev-python/imaging/imaging-2.0.0.ebuild
+++ b/dev-python/imaging/imaging-2.0.0.ebuild
@@ -1,6 +1,6 @@
 # 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-2.0.0.ebuild,v 1.1 2013/05/27 23:27:33 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/imaging/imaging-2.0.0.ebuild,v 1.2 2013/05/28 22:29:32 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -51,9 +51,7 @@ python_prepare_all() {
 	local patches=(
 		"${FILESDIR}/imaging-1.1.7-no-xv.patch"
 		"${FILESDIR}/imaging-2.0.0-delete_hardcoded_paths.patch"
-		"${FILESDIR}/imaging-2.0.0-gif_transparency.patch"
 		"${FILESDIR}/imaging-2.0.0-libm_linking.patch"
-		"${FILESDIR}/imaging-2.0.0-GifImagePlugin.patch"
 	)
 	epatch "${patches[@]}"