Fix syntax (bug #265805).

Package-Manager: portage-14029-svn/cvs/Linux x86_64

4 files changed, 93 insertions, 7 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/Manifest b/dev-python/fonttools/Manifest
index 4c4ae4fc3739..4c47164c5a8d 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +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.ebuild 744 RMD160 a74c490d1e37b1177065bb673e2df368092ced17 SHA1 d9033ba7039fec1500821dc05fea95317234b019 SHA256 078f96a2fa7dd654d26f1547f0e56036fb69941218f118f5f12583880c2faf72
-MISC ChangeLog 2241 RMD160 5b1e8df4b8b9056bfbe67c3c63ec14c40662a1e5 SHA1 fffb152fd49fdd4778a2d8b08dce644cde9180af SHA256 6ebf5fd62a6899135c545fd20f148627491b687ed9e6b5944002166f778bc140
+EBUILD fonttools-2.2.ebuild 831 RMD160 d57bf417553abc79c084c1eb8ae516e79a55083b SHA1 cbd5c1bc2b86b899e0c425e7e815016f4ecedfd8 SHA256 c4b3862d713cc4802fe8ee598b30d14acf8cbe99562b180170543d257201ebe1
+MISC ChangeLog 2411 RMD160 46f41623be2a45b5a203d2cbe73dd94704fb128f SHA1 c062d6973b9800a0e6bc3728a410c357b67b1677 SHA256 6768dbcf19760ec5f4acb763169abde8dc3df02a72cfbb9c45ed536f9a51324c
 MISC metadata.xml 178 RMD160 6dc6620ea27fc10b42c9582bdc070d3fa56d1b88 SHA1 b3753f898413e02c6cca21756d439a73969a3f38 SHA256 5c62f8ad3108233908a9887b21b1776a3d48911ab9c5150c73bb39103d2e0185
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() {