Version bump.

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

4 files changed, 85 insertions, 18 deletions

diff --git a/app-editors/leo/ChangeLog b/app-editors/leo/ChangeLog
index 78ba56f426a4..3c0750437e7d 100644
--- a/app-editors/leo/ChangeLog
+++ b/app-editors/leo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/leo
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.14 2009/10/15 11:38:16 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.15 2010/03/13 17:18:33 arfrever Exp $
+
+*leo-4.7.1 (13 Mar 2010)
+
+  13 Mar 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -leo-4.2.ebuild, -leo-4.4.7-r1.ebuild, +leo-4.7.1.ebuild,
+  +files/leo-4.7.1-fix_syntax_errors.patch, -files/leoConfig.py.patch:
+  Version bump.
 
   15 Oct 2009; Markus Meier <maekke@gentoo.org> leo-4.6.3.ebuild:
   amd64/x86 stable, bug #287946
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 0222020b5103..a9f6ff73c14e 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX leoConfig.py.patch 904 RMD160 20b5ebae0606fdb4c6931e9e900e5872104fdb25 SHA1 24d696e303823c35274070dfc92bec27366d3110 SHA256 3c47baa9dd3cfc50bb3d5359f555e860cbd77f593090175d02dc7ce839bec3a8
+AUX leo-4.7.1-fix_syntax_errors.patch 1361 RMD160 3f92d3354d8b35cd354cfdfea537ce72ff5554be SHA1 64a5c7dfb3846d3926d206f17a5a535f67c2ab72 SHA256 fc70d635e54c7964ed654f3f3b068e3f2f0fe62dfd0f9923d3923a64f697ec92
 DIST Leo-4-6-3-final.zip 6839330 RMD160 646251de08b03913a7802d0a10a04d9fb160e37c SHA1 79630cb99ba3febc08b03034c847e4807162338f SHA256 b17cf02294d25f02cbb408d076e3c21529c4c5ff4d8fde39a04d44a99c5df512
-DIST leo-4.2-final.zip 1819202 RMD160 e19ebb8368e19f960435b2daba08d4ca765b855e SHA1 6dec53a399ad439549e3ae8876761f5daf443106 SHA256 c353c8df8d372edf89086e8a6efba3537ccc9fca3eed96ebf54d2c4ed41024e9
-DIST leo-4.4.7-final.zip 7386349 RMD160 c94a16f859120acc7459f9228daa7fa39831200c SHA1 152536d2c3a2779384947046639ead0970a08eb1 SHA256 3de11611b400733a77341c0819be6dd930f76a29722dd5fe70e6978bfcfab11d
-EBUILD leo-4.2.ebuild 1058 RMD160 59877cfa17e106db587ae0c1d5f85ba23ad44c8d SHA1 334b6621eed6b50e8638eca24ac97135b1f94c0c SHA256 5c25d75f90d463f8b619db28255c40601ccbd2e1b8f14c017b480e5adb4098f2
-EBUILD leo-4.4.7-r1.ebuild 1402 RMD160 346de84ef2314383391b56c58f5882ec38946901 SHA1 ed8c717baa6a84de779046004e479195a8886ea2 SHA256 d149358faf4778b39b861382c00705d1a9e9644c514e5feb76d40da5d0a0a6b7
+DIST Leo-4.7.1-final.zip 6754983 RMD160 b29a7a1188c2a31c3940ce0e641c605482f18e76 SHA1 b8ba638bbb2e5564f226e7a5dfc596f2bbeb08a5 SHA256 9e34609d25581092e3f837dd3617a7500c720fb2634941e47a50b187ae68b3d1
 EBUILD leo-4.6.3.ebuild 859 RMD160 caca8c5e5dbf696657af8a67a9839d61ee29d04a SHA1 9974513167427580543ec3e23ce1696cb1f61aad SHA256 ed7b2b10e47cd823e2d487f089a3c88fe440a3117bd389dd4367b35a79dbfe16
-MISC ChangeLog 2006 RMD160 e6c36a59f1b1b5bc9091df5339e1ed5efdb6a740 SHA1 af316737fbf98d19e62dbe43764c8b4063ec41a4 SHA256 02ccecc927e63160e00166675e55cf899d622f77f611edc92b435177dbb8f0d7
+EBUILD leo-4.7.1.ebuild 954 RMD160 5c30159650ff3f698d4732fd7fbe09596468c8f9 SHA1 9ca666fc836a1567662d7a6baa6bcaef8271fe53 SHA256 861db8100936b9813b97577332ed8300f1aa7a00956ed82fb316aae22464429d
+MISC ChangeLog 2255 RMD160 6d7a082e256a25bd2b2f98910c950c7d895398af SHA1 11287da9e7c352557c9f2d9dc33ed2d7c2c561ab SHA256 f4f38233d0397eabe2e5c9fae374780ec2706ccbfeb973ba2fe111f879e36773
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrXCc0ACgkQkKaRLQcq0GJMewCdF/cydj9GEhvkgm7z90U0tiIv
-G8sAnRV2aNq48mnN6dZC+IiSvkVnCN5E
-=/lo7
------END PGP SIGNATURE-----
diff --git a/app-editors/leo/files/leo-4.7.1-fix_syntax_errors.patch b/app-editors/leo/files/leo-4.7.1-fix_syntax_errors.patch
new file mode 100644
index 000000000000..2809f2d3f2b2
--- /dev/null
+++ b/app-editors/leo/files/leo-4.7.1-fix_syntax_errors.patch
@@ -0,0 +1,32 @@
+--- leo/plugins/ConceptualSort.py
++++ leo/plugins/ConceptualSort.py
+@@ -207,8 +207,7 @@
+                 usort = compile( code, 'user_sort', 'exec' )
+                 def lcsort2( a, b, atts =atts ):
+                     z = {}
+-                    # exec usort in {}, z
+-                    exec(usort,{},z)
++                    exec usort in {}, z
+                     rv = z[ 'user_sort' ]( a, b, atts )
+                     return rv
+                 self.children.sort( lcsort2 )
+--- leo/plugins/LeoN.py
++++ leo/plugins/LeoN.py
+@@ -216,7 +216,7 @@
+ 
+         # receive an operation to execute
+         if dbg >=1:
+-            print("Site %i;%s; '%s'; receiving %s"%(self.site_index, self.state_vector, self.get_text(), t_op)
++            print("Site %i;%s; '%s'; receiving %s"%(self.site_index, self.state_vector, self.get_text(), t_op))
+ 
+ 
+         if is_causally_ready(t_op, self): 		# check if it is causally ready
+@@ -308,7 +308,7 @@
+         if undoed: # if there was an undo, then redo
+             if dbg>=1:
+                 print("Site %i; '%s'; undoed %s; executed %s;"%(
+-                    self.site_index, self.get_text(), undoed, EOnew) # just for debugging
++                    self.site_index, self.get_text(), undoed, EOnew)) # just for debugging
+             EOoL = [] # EO'm+1 List
+ 
+             EOoL.append( IT( HB[m+1], EOnew ) ) 
diff --git a/app-editors/leo/leo-4.7.1.ebuild b/app-editors/leo/leo-4.7.1.ebuild
new file mode 100644
index 000000000000..7b5caa145332
--- /dev/null
+++ b/app-editors/leo/leo-4.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.7.1.ebuild,v 1.1 2010/03/13 17:18:33 arfrever Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.6"
+PYTHON_USE_WITH="tk"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit distutils eutils
+
+MY_P="Leo-${PV}-final"
+
+DESCRIPTION="Leo: Literate Editor with Outlines"
+HOMEPAGE="http://leo.sourceforge.net/ http://pypi.python.org/pypi/leo"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="app-text/silvercity
+	dev-python/PyQt4[X]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-fix_syntax_errors.patch"
+}
+
+src_install() {
+	distutils_src_install
+	dohtml -r leo/doc/html/* || die "dohtml failed"
+	dodoc leo/doc/README.TXT || die "dodoc failed"
+}