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

(Portage version: 2.1.4.4)

4 files changed, 70 insertions, 76 deletions

diff --git a/app-editors/leo/ChangeLog b/app-editors/leo/ChangeLog
index 0289d6ab4c76..8f5826602876 100644
--- 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/files/leoGlobals-4.4.1_beta2.patch b/app-editors/leo/files/leoGlobals-4.4.1_beta2.patch
deleted file mode 100644
index ad16196bcbbd..000000000000
--- 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
index 44f55e64d031..000000000000
--- 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
index 000000000000..fd0ab74a49e1
--- /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}
+}