Delete older ebuild.

(Portage version: 2.2.0_alpha2_p2/cvs/Linux x86_64)

3 files changed, 5 insertions, 116 deletions

diff --git a/dev-python/fonttools/ChangeLog b/dev-python/fonttools/ChangeLog
index 7db783bc1cb1..dce75d5be211 100644
--- a/dev-python/fonttools/ChangeLog
+++ b/dev-python/fonttools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/fonttools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.25 2010/02/07 20:37:15 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/fonttools/ChangeLog,v 1.26 2010/10/30 22:46:42 arfrever Exp $
+
+  30 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -fonttools-2.2-r1.ebuild, -files/fonttools-2.2-fix_syntax.patch:
+  Delete.
 
   07 Feb 2010; Peter Volkov <pva@gentoo.org> fonttools-2.2-r1.ebuild:
   Add inherit eutils: epatch is defined there.
diff --git a/dev-python/fonttools/files/fonttools-2.2-fix_syntax.patch b/dev-python/fonttools/files/fonttools-2.2-fix_syntax.patch
deleted file mode 100644
index 4e7b1502ce8a..000000000000
--- a/dev-python/fonttools/files/fonttools-2.2-fix_syntax.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- 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-r1.ebuild b/dev-python/fonttools/fonttools-2.2-r1.ebuild
deleted file mode 100644
index 301de1daf923..000000000000
--- a/dev-python/fonttools/fonttools-2.2-r1.ebuild
+++ /dev/null
@@ -1,38 +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/fonttools/fonttools-2.2-r1.ebuild,v 1.5 2010/02/07 20:37:15 pva Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit eutils distutils
-
-DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
-HOMEPAGE="http://fonttools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=dev-python/numpy-1.0.2
-	dev-python/pyxml"
-
-RESTRICT_PYTHON_ABIS="3*"
-
-PYTHON_MODNAME="FontTools"
-
-DOCS="README.txt Doc/*.txt"
-
-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() {
-	distutils_src_install
-	dohtml Doc/*.html
-}