Fix syntax (bug #265805).

(Portage version: 14029-svn/cvs/Linux x86_64)

3 files changed, 90 insertions, 5 deletions

diff --git a/dev-python/fonttools/ChangeLog b/dev-python/fonttools/ChangeLog
index 4c90737a590c..8ac17baf4f7d 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.14 2009/01/12 15:15:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.15 2009/08/14 15:35:10 arfrever Exp $
+
+  14 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  fonttools-2.2.ebuild, +files/fonttools-2.2-fix_syntax.patch:
+  Fix syntax (bug #265805).
 
   12 Jan 2009; Peter Volkov <pva@gentoo.org> -fonttools-2.0_beta1.ebuild,
   -fonttools-2.0_beta1-r1.ebuild, fonttools-2.2.ebuild:
diff --git a/dev-python/fonttools/files/fonttools-2.2-fix_syntax.patch b/dev-python/fonttools/files/fonttools-2.2-fix_syntax.patch
new file mode 100644
index 000000000000..4e7b1502ce8a
--- /dev/null
+++ b/dev-python/fonttools/files/fonttools-2.2-fix_syntax.patch
@@ -0,0 +1,77 @@
+--- Lib/fontTools/ttLib/tables/_c_m_a_p.py
++++ Lib/fontTools/ttLib/tables/_c_m_a_p.py
+@@ -174,7 +174,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(data[offset:offset+int(length)], ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 		data = self.data # decompileHeader assigns the data after the header to self.data
+ 		assert 262 == self.length, "Format 0 cmap subtable not 262 bytes"
+ 		glyphIdArray = array.array("B")
+@@ -262,7 +262,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(data[offset:offset+int(length)], ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 
+ 		data = self.data # decompileHeader assigns the data after the header to self.data
+ 		subHeaderKeys = []
+@@ -632,7 +632,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(self.data[offset:offset+int(length)], ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 
+ 		data = self.data # decompileHeader assigns the data after the header to self.data
+ 		(segCountX2, searchRange, entrySelector, rangeShift) = \
+@@ -836,7 +836,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(data[offset:offset+int(length)], ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 
+ 		data = self.data # decompileHeader assigns the data after the header to self.data
+ 		firstCode, entryCount = struct.unpack(">HH", data[:4])
+@@ -924,7 +924,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(data[offset:offset+int(length)], ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 
+ 		data = self.data # decompileHeader assigns the data after the header to self.data
+ 		charCodes = []
+@@ -1086,7 +1086,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(data, ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 		data = self.data
+ 		
+ 		self.cmap = {} # so that clients that expect this to exist in a cmap table won't fail.
+@@ -1277,7 +1277,7 @@
+ 		if data != None and ttFont != None:
+ 			self.decompileHeader(data[offset:offset+int(length)], ttFont)
+ 		else:
+-			assert(	(data == None and (ttFont == None), "Need both data and ttFont arguments"))
++			assert (data == None and ttFont == None), "Need both data and ttFont arguments"
+ 
+ 	def compile(self, ttFont):
+ 		if self.data:
+--- Lib/fontTools/ttLib/tables/ttProgram.py
++++ Lib/fontTools/ttLib/tables/ttProgram.py
+@@ -394,7 +394,7 @@
+ 	
+ 	p = Program()
+ 	p.fromBytecode(bc)
+-	as = p.getAssembly()
+-	p.fromAssembly(as)
++	assembly = p.getAssembly()
++	p.fromAssembly(assembly)
+ 	print bc == p.getBytecode()
+ 
diff --git a/dev-python/fonttools/fonttools-2.2.ebuild b/dev-python/fonttools/fonttools-2.2.ebuild
index d90aae5aa58d..9731f16ad94f 100644
--- a/dev-python/fonttools/fonttools-2.2.ebuild
+++ b/dev-python/fonttools/fonttools-2.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/fonttools-2.2.ebuild,v 1.5 2009/01/12 15:15:32 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/fonttools-2.2.ebuild,v 1.6 2009/08/14 15:35:10 arfrever Exp $
+
+EAPI="2"
 
 inherit distutils
 
@@ -17,12 +19,14 @@ DEPEND="virtual/python
 	>=dev-python/numpy-1.0.2
 	dev-python/pyxml"
 
+PYTHON_MODNAME="FontTools"
+
 DOCS="README.txt Doc/*.txt"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	distutils_src_prepare
 	sed '/data_files/{s:man/man1:share/man/man1:}' -i setup.py #247154
+	epatch "${FILESDIR}/${P}-fix_syntax.patch"
 }
 
 src_install() {