Version bump (bug #153233). Dropped old version.

Package-Manager: portage-2.1.4.4

diff --git a/app-editors/leo/ChangeLog b/app-editors/leo/ChangeLog
index 0289d6ab4c76fe3cb3833bac1300f59892bc2417..8f582660287665be786ee3594982790ce6cf695f 100644 (file)
--- a/app-editors/leo/ChangeLog
+++ b/app-editors/leo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-editors/leo
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.9 2007/06/23 09:56:19 hawking Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.10 2008/03/01 11:51:09 dev-zero Exp $
+
+*leo-4.4.7 (01 Mar 2008)
+
+  01 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
+  -files/leoGlobals-4.4.1_beta2.patch, -leo-4.4.1_beta2.ebuild,
+  +leo-4.4.7.ebuild:
+  Version bump (bug #153233). Dropped old version.
 
   23 Jun 2007; Ali Polatel <hawking@gentoo.org> leo-4.2.ebuild,
   leo-4.4.1_beta2.ebuild:

diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 2844b3469a88f00bc965f0a4842bf310bfedf14b..94bf9ab6e664db76dba24a2f6fe753572ce8b015 100644 (file)
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -1,8 +1,7 @@
 AUX leoConfig.py.patch 904 RMD160 20b5ebae0606fdb4c6931e9e900e5872104fdb25 SHA1 24d696e303823c35274070dfc92bec27366d3110 SHA256 3c47baa9dd3cfc50bb3d5359f555e860cbd77f593090175d02dc7ce839bec3a8
-AUX leoGlobals-4.4.1_beta2.patch 706 RMD160 677d499240cb645c1d68704504c71ceb5b46367d SHA1 8d59854ee5b45bd791edbd5d4f350d2cf88e4271 SHA256 817e652fec6114476a0cbeae7b585166a96befa2caae40db232d042bf012a363
-DIST leo-4-4-1-beta-2.zip 5160976 RMD160 a6254f4b247984794ee1f5961b1b62c7f53112c0 SHA1 f72f50c3486ee984fb754ea0ab324143d3aab173 SHA256 aa4041802f5ee255cf2cb40ffbeda316af7be6ddc115baff4dd34e5482a6085d
 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.1_beta2.ebuild 1111 RMD160 87154829db6c1395dc1f02b2d90d8e2b635b0525 SHA1 f830cbf04258b8de30d39e5c5e7ae9eef7c04293 SHA256 22a0507eaecbd5d6926c030b8da8a9ef784402a6d9d2ff57268157abade396e2
-MISC ChangeLog 1282 RMD160 1a94f0381dc2deaef71ee1f950366da34f52479e SHA1 682363498bfa5153c382ea276e09596cda373bf9 SHA256 82f0092b522c0f30d4f02c79ba4522fac2a9c1ac6966c0ee5e34bc01553c6261
+EBUILD leo-4.4.7.ebuild 1303 RMD160 b5a01f3dc8872cf8bed61fb6d23ea9d0af4fe7de SHA1 08e112ac092b78297e1ccac105a8935844815d11 SHA256 7e9f2049c8c8708c7221ca936a54902485244b41a685b23f92e95e5746a53007
+MISC ChangeLog 1500 RMD160 41eea42a1c6f88da89e957ecfb5ffe1ed5b9e553 SHA1 54297ed3cf438357f4bb7a47042887b145fe104d SHA256 7e15d4bc16b8a815e6f0d51631b21cd2a0d084b96f130ee1e5ec6e4e2652cd4d
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a

diff --git a/app-editors/leo/files/leoGlobals-4.4.1_beta2.patch b/app-editors/leo/files/leoGlobals-4.4.1_beta2.patch
deleted file mode 100644 (file)
index ad16196..0000000
--- a/app-editors/leo/files/leoGlobals-4.4.1_beta2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/leoGlobals.py.old      2006-06-25 22:50:52.000000000 +0200
-+++ src/leoGlobals.py  2006-06-25 23:03:23.000000000 +0200
-@@ -118,20 +118,9 @@
-     
-     encoding = g.startupEncoding()
- 
--    try:
--        theDir = sys.leo_config_directory
--    except AttributeError:
--        theDir = g.os_path_join(g.app.loadDir,"..","config")
--        
--    if theDir:
--        theDir = g.os_path_abspath(theDir)
--        
--    if (
--        not theDir or
--        not g.os_path_exists(theDir,encoding) or
--        not g.os_path_isdir(theDir,encoding)
--    ):
--        theDir = None
-+    theDir = os.path.expanduser("~/.leo")
-+    if not os.path.exists(theDir):
-+        os.mkdir(theDir)
-     
-     return theDir
- #@nonl

diff --git a/app-editors/leo/leo-4.4.1_beta2.ebuild b/app-editors/leo/leo-4.4.1_beta2.ebuild
deleted file mode 100644 (file)
index 44f55e6..0000000
--- a/app-editors/leo/leo-4.4.1_beta2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.4.1_beta2.ebuild,v 1.2 2007/06/23 09:56:19 hawking Exp $
-
-NEED_PYTHON=2.3
-
-inherit eutils python
-
-MY_P="${PN}-4-4-1-beta-2"
-DESCRIPTION="Leo is an outlining editor and literate programming tool."
-HOMEPAGE="http://leo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-       python_tkinter_exists
-}
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${FILESDIR}/leoGlobals-${PV}.patch"
-}
-
-src_install() {
-       dodir /usr/share/doc/
-       mv doc "${D}/usr/share/doc/${PF}"
-       rm PKG-INFO MANIFEST install manifest.in uninstall
-
-       python_version
-       destdir="/usr/$(get_libdir)/python${PYVER}/site-packages/leo"
-       dodir "${destdir}"
-       cp -r * "${D}/${destdir}" || die "cp failed"
-
-       echo "#!/bin/bash" > leo
-       echo "exec ${python} ${destdir}/src/leo.py \"\$1\"" >> leo
-       exeinto /usr/bin
-       doexe leo || die "doexe failed"
-}

diff --git a/app-editors/leo/leo-4.4.7.ebuild b/app-editors/leo/leo-4.4.7.ebuild
new file mode 100644 (file)
index 0000000..fd0ab74
--- /dev/null
+++ b/app-editors/leo/leo-4.4.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.4.7.ebuild,v 1.1 2008/03/01 11:51:09 dev-zero Exp $
+
+NEED_PYTHON="2.3"
+
+inherit python multilib
+
+MY_P="${P}-final"
+
+DESCRIPTION="An outlining editor and literate programming tool."
+HOMEPAGE="http://leo.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND="app-text/silvercity"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       python_tkinter_exists
+}
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       # Remove all CVS directories
+       find . -iname "CVS" -exec rm -rf {} \; 2>/dev/null
+}
+
+src_install() {
+       dohtml -r doc/html/*
+       dodoc doc/README.TXT
+
+       python_version
+
+       insinto "/usr/$(get_libdir)/python${PYVER}/site-packages/leo"
+       doins -r config extensions Icons  __init__.py modes plugins scripts src
+
+       cat > leo <<- _EOF_
+#!/bin/sh
+${python} /usr/$(get_libdir)/python${PYVER}/site-packages/leo/src/leo.py \$@
+       _EOF_
+
+       dobin leo
+}
+
+pkg_postinst() {
+       python_version
+       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+}
+
+pkg_postrm() {
+       python_version
+       python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+}