Remove unused patch.

3 files changed, 6 insertions, 275 deletions

diff --git a/dev-python/fonttools/ChangeLog b/dev-python/fonttools/ChangeLog
index 3ee6f0694bbc..28c1bc328fe5 100644
--- a/dev-python/fonttools/ChangeLog
+++ b/dev-python/fonttools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/fonttools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.16 2009/08/14 15:45:10 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.17 2009/09/06 22:53:45 idl0r Exp $
+
+  06 Sep 2009; Christian Ruppert <idl0r@gentoo.org>
+  -files/fonttools-2.0_beta1-numpy.patch:
+  Remove unused patch.
 
 *fonttools-2.2-r1 (14 Aug 2009)
 
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 2e3484716322..f36566aedf6e 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,6 @@
-AUX fonttools-2.0_beta1-numpy.patch 9465 RMD160 5f4a16ba57baa42e5f2ba64ca069ba82c4ea374f SHA1 6ebc676968c45887cde1dba7141fc0ad1481d1e0 SHA256 434f207cd1f6c9cd506f9ddffa6cb449da80ab380e7038944c85279409c421fb
 AUX fonttools-2.2-fix_syntax.patch 3347 RMD160 5abdb526c9c85c35d3a5888762aeaeaf506d4e9a SHA1 6cf0280eb2818b4ef5daf88ea806e63b3e5ab6cf SHA256 568429c60e63d3f8ba1a6aede1a219f92680d6336b41ed06751af62b2caa320c
 DIST fonttools-2.2.tar.gz 336019 RMD160 77aa0498acfe8eed19c02e558bd81afe2ff5f713 SHA1 7f4c63b4c42057a01552f54c392c0e9184e27df0 SHA256 ee8c58948c4ed2e93fd6061cbc505b753a92945658bec6a3d251636e09313afe
 EBUILD fonttools-2.2-r1.ebuild 884 RMD160 c5c90e83e5d7ba735757a37817d8f75bf1dc4179 SHA1 1863c32a0f1ed677501694175d88194541553ab3 SHA256 f0c9fd5b9adc5205e2b376c8b87115e88f155da6aecb86a327d4ef9059b40ac8
 EBUILD fonttools-2.2.ebuild 831 RMD160 d57bf417553abc79c084c1eb8ae516e79a55083b SHA1 cbd5c1bc2b86b899e0c425e7e815016f4ecedfd8 SHA256 c4b3862d713cc4802fe8ee598b30d14acf8cbe99562b180170543d257201ebe1
-MISC ChangeLog 2573 RMD160 b45525364222dc444dec92562fde3f4f9f18c4d0 SHA1 675509ece7cbd28806690424fb647f417cb37819 SHA256 5fe1db64c75d975ad247092cde4e3ef91f18c9848f94be6aafd2b22d93c52d17
+MISC ChangeLog 2691 RMD160 1ead3fa32bacc6d54edd0d8783226a68029a4274 SHA1 372f0f099dbbc3cb7a8dbaec9893e59a1c5f7c33 SHA256 ed431c87929ee9bb45ba8023e67a6108e2d0a69583a7dbbab89c21658603d6dc
 MISC metadata.xml 178 RMD160 6dc6620ea27fc10b42c9582bdc070d3fa56d1b88 SHA1 b3753f898413e02c6cca21756d439a73969a3f38 SHA256 5c62f8ad3108233908a9887b21b1776a3d48911ab9c5150c73bb39103d2e0185
diff --git a/dev-python/fonttools/files/fonttools-2.0_beta1-numpy.patch b/dev-python/fonttools/files/fonttools-2.0_beta1-numpy.patch
deleted file mode 100644
index 5956f9476e09..000000000000
--- a/dev-python/fonttools/files/fonttools-2.0_beta1-numpy.patch
+++ /dev/null
@@ -1,272 +0,0 @@
-diff -ur fonttools/Lib/fontTools/cffLib.py fonttools_numpy/Lib/fontTools/cffLib.py
---- fonttools/Lib/fontTools/cffLib.py	2002-09-10 22:43:07.000000000 +0300
-+++ fonttools_numpy/Lib/fontTools/cffLib.py	2007-07-19 01:06:17.000000000 +0300
-@@ -1,3 +1,5 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- """cffLib.py -- read/write tools for Adobe CFF fonts."""
- 
- #
-@@ -1005,7 +1007,7 @@
- 
- 
- def encodeNumber(num):
--	if type(num) == FloatType:
-+	if isinstance(num, FloatType):
- 		return psCharStrings.encodeFloat(num)
- 	else:
- 		return psCharStrings.encodeIntCFF(num)
-diff -ur fonttools/Lib/fontTools/misc/arrayTools.py fonttools_numpy/Lib/fontTools/misc/arrayTools.py
---- fonttools/Lib/fontTools/misc/arrayTools.py	2000-01-26 21:32:45.000000000 +0200
-+++ fonttools_numpy/Lib/fontTools/misc/arrayTools.py	2007-07-19 01:06:17.000000000 +0300
-@@ -1,8 +1,10 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- #
- # Various array and rectangle tools
- #
- 
--import Numeric
-+import numpy.oldnumeric as Numeric
- 
- 
- def calcBounds(array):
-diff -ur fonttools/Lib/fontTools/misc/psCharStrings.py fonttools_numpy/Lib/fontTools/misc/psCharStrings.py
---- fonttools/Lib/fontTools/misc/psCharStrings.py	2002-09-10 22:43:12.000000000 +0300
-+++ fonttools_numpy/Lib/fontTools/misc/psCharStrings.py	2007-07-19 01:06:17.000000000 +0300
-@@ -1,3 +1,5 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- """psCharStrings.py -- module implementing various kinds of CharStrings: 
- CFF dictionary data and Type1/Type2 CharStrings.
- """
-@@ -526,7 +528,7 @@
- 		self.defaultWidthX = defaultWidthX
- 	
- 	def reset(self):
--		import Numeric
-+		import numpy.oldnumeric as Numeric
- 		SimpleT2Decompiler.reset(self)
- 		self.hints = []
- 		self.gotWidth = 0
-@@ -545,7 +547,7 @@
- 			self.contours[-1][2] = 1
- 	
- 	def appendPoint(self, point, isPrimary):
--		import Numeric
-+		import numpy.oldnumeric as Numeric
- 		point = self.currentPoint + Numeric.array(point, Numeric.Int16)
- 		if not self.contours or self.contours[-1][2]:
- 			# The subpath doesn't start with a moveto. Not sure whether
-diff -ur fonttools/Lib/fontTools/nfntLib.py fonttools_numpy/Lib/fontTools/nfntLib.py
---- fonttools/Lib/fontTools/nfntLib.py	2001-03-09 14:42:25.000000000 +0200
-+++ fonttools_numpy/Lib/fontTools/nfntLib.py	2007-07-19 01:06:17.000000000 +0300
-@@ -1,3 +1,5 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- import struct, sstruct
- import string
- import types
-@@ -77,7 +79,7 @@
- 		return header + self.bits + locTable + owTable
- 	
- 	def unpackGlyphs(self):
--		import Numeric
-+		import numpy.oldnumeric as Numeric
- 		nGlyphs = len(self.locTable) - 1
- 		self.glyphs = [None] * nGlyphs
- 		
-@@ -108,7 +110,7 @@
- 				self.glyphs[i] = glyph = Glyph(width, offset, bitImage[imageL:imageR])
- 	
- 	def packGlyphs(self):
--		import Numeric
-+		import numpy.oldnumeric as Numeric
- 		imageWidth = 0
- 		kernMax = 0
- 		imageHeight = None
-@@ -260,7 +262,7 @@
- class Glyph:
- 	
- 	def __init__(self, width, offset, pixels=None, pixelDepth=1):
--		import Numeric
-+		import numpy.oldnumeric as Numeric
- 		self.width = width
- 		self.offset = offset
- 		self.pixelDepth = pixelDepth
-@@ -279,7 +281,7 @@
- 		if not nameOrID:
- 			# just take the first in the file
- 			res = Res.Get1IndResource(resType, 1)
--		elif type(nameOrID) == types.IntType:
-+		elif isinstance(nameOrID, types.IntType):
- 			res = Res.Get1Resource(resType, nameOrID)
- 		else:
- 			res = Res.Get1NamedResource(resType, nameOrID)
-diff -ur fonttools/Lib/fontTools/ttLib/sfnt.py fonttools_numpy/Lib/fontTools/ttLib/sfnt.py
---- fonttools/Lib/fontTools/ttLib/sfnt.py	2002-09-10 22:43:18.000000000 +0300
-+++ fonttools_numpy/Lib/fontTools/ttLib/sfnt.py	2007-07-19 01:06:17.000000000 +0300
-@@ -1,3 +1,5 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- """ttLib/sfnt.py -- low-level module to deal with the sfnt file format.
- 
- Defines two public classes:
-@@ -13,7 +15,7 @@
- """
- 
- import struct, sstruct
--import Numeric
-+import numpy.oldnumeric as Numeric
- import os
- 
- 
-@@ -213,7 +215,7 @@
- 		data = data + '\0' * (4-remainder)
- 	a = Numeric.fromstring(struct.pack(">l", start) + data, Numeric.Int32)
- 	if ttLib.endian <> "big":
--		a = a.byteswapped()
-+		a = a.byteswap()
- 	return Numeric.add.reduce(a)
- 
- 
-diff -ur fonttools/Lib/fontTools/ttLib/tables/_g_l_y_f.py fonttools_numpy/Lib/fontTools/ttLib/tables/_g_l_y_f.py
---- fonttools/Lib/fontTools/ttLib/tables/_g_l_y_f.py	2002-09-10 22:43:24.000000000 +0300
-+++ fonttools_numpy/Lib/fontTools/ttLib/tables/_g_l_y_f.py	2007-07-19 01:06:18.000000000 +0300
-@@ -1,3 +1,5 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- """_g_l_y_f.py -- Converter classes for the 'glyf' table."""
- 
- 
-@@ -20,7 +22,7 @@
- from fontTools.misc.textTools import safeEval, readHex
- import ttProgram
- import array
--import Numeric
-+import numpy.oldnumeric as Numeric
- from types import StringType, TupleType
- 
- 
-@@ -468,7 +470,7 @@
- 		nCoordinates = len(self.coordinates)
- 		
- 		# make a copy
--		coordinates = self.coordinates.astype(self.coordinates.typecode())
-+		coordinates = self.coordinates.astype(self.coordinates.dtype.char)
- 		# absolute to relative coordinates
- 		coordinates[1:] = Numeric.subtract(coordinates[1:], coordinates[:-1])
- 		flags = self.flags
-diff -ur fonttools/Lib/fontTools/ttLib/tables/_h_m_t_x.py fonttools_numpy/Lib/fontTools/ttLib/tables/_h_m_t_x.py
---- fonttools/Lib/fontTools/ttLib/tables/_h_m_t_x.py	2002-09-10 22:43:25.000000000 +0300
-+++ fonttools_numpy/Lib/fontTools/ttLib/tables/_h_m_t_x.py	2007-07-19 01:06:18.000000000 +0300
-@@ -1,5 +1,7 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- import DefaultTable
--import Numeric
-+import numpy.oldnumeric as Numeric
- from fontTools import ttLib
- from fontTools.misc.textTools import safeEval
- 
-@@ -16,7 +18,7 @@
- 		metrics = Numeric.fromstring(data[:4 * numberOfMetrics], 
- 				Numeric.Int16)
- 		if ttLib.endian <> "big":
--			metrics = metrics.byteswapped()
-+			metrics = metrics.byteswap()
- 		metrics.shape = (numberOfMetrics, 2)
- 		data = data[4 * numberOfMetrics:]
- 		numberOfSideBearings = ttFont['maxp'].numGlyphs - numberOfMetrics
-@@ -29,7 +31,7 @@
- 			sideBearings = Numeric.fromstring(data[:2 * numberOfSideBearings], 
- 					Numeric.Int16)
- 			if ttLib.endian <> "big":
--				sideBearings = sideBearings.byteswapped()
-+				sideBearings = sideBearings.byteswap()
- 			data = data[2 * numberOfSideBearings:]
- 			additionalMetrics = Numeric.array([advances, sideBearings], 
- 					Numeric.Int16)
-@@ -63,12 +65,12 @@
- 		
- 		metrics = Numeric.array(metrics, Numeric.Int16)
- 		if ttLib.endian <> "big":
--			metrics = metrics.byteswapped()
-+			metrics = metrics.byteswap()
- 		data = metrics.tostring()
- 		
- 		additionalMetrics = Numeric.array(additionalMetrics, Numeric.Int16)
- 		if ttLib.endian <> "big":
--			additionalMetrics = additionalMetrics.byteswapped()
-+			additionalMetrics = additionalMetrics.byteswap()
- 		data = data + additionalMetrics.tostring()
- 		return data
- 	
-diff -ur fonttools/Lib/fontTools/ttLib/tables/_l_o_c_a.py fonttools_numpy/Lib/fontTools/ttLib/tables/_l_o_c_a.py
---- fonttools/Lib/fontTools/ttLib/tables/_l_o_c_a.py	2000-11-03 12:29:08.000000000 +0200
-+++ fonttools_numpy/Lib/fontTools/ttLib/tables/_l_o_c_a.py	2007-07-19 01:06:18.000000000 +0300
-@@ -1,6 +1,8 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- import DefaultTable
- import array
--import Numeric
-+import numpy.oldnumeric as Numeric
- from fontTools import ttLib
- import struct
- 
-@@ -34,7 +36,7 @@
- 		else:
- 			ttFont['head'].indexToLocFormat = 1
- 		if ttLib.endian <> "big":
--			locations = locations.byteswapped()
-+			locations = locations.byteswap()
- 		return locations.tostring()
- 	
- 	def set(self, locations):
-diff -ur fonttools/Lib/fontTools/ttLib/tables/_v_m_t_x.py fonttools_numpy/Lib/fontTools/ttLib/tables/_v_m_t_x.py
---- fonttools/Lib/fontTools/ttLib/tables/_v_m_t_x.py	1999-12-16 23:34:53.000000000 +0200
-+++ fonttools_numpy/Lib/fontTools/ttLib/tables/_v_m_t_x.py	2007-07-19 01:06:18.000000000 +0300
-@@ -1,5 +1,7 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- import DefaultTable
--import Numeric
-+import numpy.oldnumeric as Numeric
- from fontTools import ttLib
- from fontTools.misc.textTools import safeEval
- 
-diff -ur fonttools/Lib/fontTools/ttLib/test/ttBrowser.py fonttools_numpy/Lib/fontTools/ttLib/test/ttBrowser.py
---- fonttools/Lib/fontTools/ttLib/test/ttBrowser.py	2000-03-15 01:21:26.000000000 +0200
-+++ fonttools_numpy/Lib/fontTools/ttLib/test/ttBrowser.py	2007-07-19 01:06:18.000000000 +0300
-@@ -1,3 +1,5 @@
-+## Automatically adapted for numpy.oldnumeric Jul 19, 2007 by hawking
-+
- """Mac-only TrueType browser window."""
- 
- from fontTools import ttLib
-@@ -7,7 +9,7 @@
- import W, Lists
- import os
- import ATM
--import Numeric
-+import numpy.oldnumeric as Numeric
- import Qd
- from rf.views.wGlyphList import GlyphList
- 
-diff -ur fonttools/setup.py fonttools_numpy/setup.py
---- fonttools/setup.py	2002-09-10 22:43:05.000000000 +0300
-+++ fonttools_numpy/setup.py	2007-07-19 01:07:59.000000000 +0300
-@@ -11,10 +11,9 @@
- 	pass
- 
- try:
--	import Numeric
-+	import numpy.oldnumeric as Numeric
- except ImportError:
--	print "*** Warning: FontTools needs Numerical Python (NumPy), see:"
--	print "        http://sourceforge.net/projects/numpy/"
-+	print "*** Warning: FontTools needs numpy.oldnumeric module."
- 
- try:
- 	import xml.parsers.expat