Delete older ebuild.

Package-Manager: portage-2.2.0_alpha2_p2/cvs/Linux x86_64

4 files changed, 6 insertions, 120 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/Manifest b/dev-python/fonttools/Manifest
index 4c934d540e60..6b7df5d11d3e 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,7 +1,4 @@
-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
 DIST fonttools-2.3.tar.gz 348810 RMD160 df5021ea53b8a7fa016dfd3ff763b1dfaf0d7c4b SHA1 3d434d6192a1feb6605d67975c1e973e084e86d7 SHA256 b5c5afdbc19d21221d101df6e88d5c74dc83cde8b4834d790d8bb544ffcfa16a
-EBUILD fonttools-2.2-r1.ebuild 882 RMD160 423fc3b5238aa9e312e75cdbcbb94dfdf1e780b6 SHA1 1166d5dd88bcfc83fdbe0dc802d10c1eca90f74f SHA256 8beb9fc1d2c1185f9ba24dd7b92337e5866f46d4ef237a756bc764375cc2c802
 EBUILD fonttools-2.3.ebuild 750 RMD160 a0e36b9948f7521f302f17a60bb16343a722be61 SHA1 5f0414a0ccbef778339e94240989fb477e5b8976 SHA256 7301507d5c03f64fc833dc1e055889510ccca74193c596937a2cd96c3ff58dbd
-MISC ChangeLog 3502 RMD160 8f35c9e21d2556a2de342f0425ce127c8c17bcac SHA1 95d6b4f0d4223147463129ab7d9bcf2ad9178332 SHA256 04209090c4cb83696d1011006ea160fd78ed07d9aa99ae4afa029146ed49cbcd
+MISC ChangeLog 3658 RMD160 ffed62ad638b6e71d29aa782508b5bcae6066ebb SHA1 3f2e49cca977e477d0a5b344b1be64c0d2c2974a SHA256 864006480b05e3a5fb12bfb5d0f60a742e8bb55b575ad66b7a4c6dec8be9b0a4
 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
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
-}