Revbump. Use EAPI=2 and use dependencies.

Package-Manager: portage--svn/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 34 insertions, 20 deletions

diff --git a/app-editors/leo/ChangeLog b/app-editors/leo/ChangeLog
index 8f5826602876..b9ef98cf34b0 100644
--- a/app-editors/leo/ChangeLog
+++ b/app-editors/leo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/leo
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.11 2008/10/26 23:12:29 hawking Exp $
+
+*leo-4.4.7-r1 (26 Oct 2008)
+
+  26 Oct 2008; Ali Polatel <hawking@gentoo.org> -leo-4.4.7.ebuild,
+  +leo-4.4.7-r1.ebuild:
+  Revbump. Use EAPI=2 and use dependencies.
 
 *leo-4.4.7 (01 Mar 2008)
 
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 94bf9ab6e664..69e7163a8e69 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX leoConfig.py.patch 904 RMD160 20b5ebae0606fdb4c6931e9e900e5872104fdb25 SHA1 24d696e303823c35274070dfc92bec27366d3110 SHA256 3c47baa9dd3cfc50bb3d5359f555e860cbd77f593090175d02dc7ce839bec3a8
 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.ebuild 1303 RMD160 b5a01f3dc8872cf8bed61fb6d23ea9d0af4fe7de SHA1 08e112ac092b78297e1ccac105a8935844815d11 SHA256 7e9f2049c8c8708c7221ca936a54902485244b41a685b23f92e95e5746a53007
-MISC ChangeLog 1500 RMD160 41eea42a1c6f88da89e957ecfb5ffe1ed5b9e553 SHA1 54297ed3cf438357f4bb7a47042887b145fe104d SHA256 7e15d4bc16b8a815e6f0d51631b21cd2a0d084b96f130ee1e5ec6e4e2652cd4d
+EBUILD leo-4.4.7-r1.ebuild 1402 RMD160 346de84ef2314383391b56c58f5882ec38946901 SHA1 ed8c717baa6a84de779046004e479195a8886ea2 SHA256 d149358faf4778b39b861382c00705d1a9e9644c514e5feb76d40da5d0a0a6b7
+MISC ChangeLog 1664 RMD160 a1bd4165785e8f6b80676904d3472c7d1346cb1c SHA1 6a984af89605429615de59f2f88c47d5b86d3119 SHA256 52f7a88cccce94331568cfbf0db6261ab5e581413211e01bba04b011183b8d32
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkkE+WoACgkQQU4yORhF8iAeBwCffHcLwV37TiFXsXyWYVa9ahII
+j4oAoIHmZ5iepM1vdFRfmaulGNCdoLsP
+=uKfB
+-----END PGP SIGNATURE-----
diff --git a/app-editors/leo/leo-4.4.7.ebuild b/app-editors/leo/leo-4.4.7-r1.ebuild
index fd0ab74a49e1..5acb7c605e65 100644
--- a/app-editors/leo/leo-4.4.7.ebuild
+++ b/app-editors/leo/leo-4.4.7-r1.ebuild
@@ -1,9 +1,8 @@
 # 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"
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.4.7-r1.ebuild,v 1.1 2008/10/26 23:12:29 hawking Exp $
 
+EAPI=2
 inherit python multilib
 
 MY_P="${P}-final"
@@ -16,38 +15,37 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND="app-text/silvercity"
+COMMON_DEPEND=">=dev-lang/python-2.3[tk]"
+DEPEND="app-arch/unzip
+	${COMMON_DEPEND}"
+RDEPEND="app-text/silvercity
+	${COMMON_DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-pkg_setup() {
-	python_tkinter_exists
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
+	default
 
 	# Remove all CVS directories
 	find . -iname "CVS" -exec rm -rf {} \; 2>/dev/null
 }
 
 src_install() {
-	dohtml -r doc/html/*
-	dodoc doc/README.TXT
+	dohtml -r doc/html/* || die "dohtml failed"
+	dodoc doc/README.TXT || die "dodoc failed"
 
 	python_version
 
 	insinto "/usr/$(get_libdir)/python${PYVER}/site-packages/leo"
-	doins -r config extensions Icons  __init__.py modes plugins scripts src
+	doins -r config extensions Icons  __init__.py modes plugins scripts src ||\
+		die "doins failed"
 
 	cat > leo <<- _EOF_
 #!/bin/sh
 ${python} /usr/$(get_libdir)/python${PYVER}/site-packages/leo/src/leo.py \$@
 	_EOF_
 
-	dobin leo
+	dobin leo || die "dobin failed"
 }
 
 pkg_postinst() {
@@ -57,5 +55,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}
 }