check tk support for python, fix headers, cosmetics

Package-Manager: portage-2.1.3_rc4

4 files changed, 40 insertions, 28 deletions

diff --git a/app-editors/leo/ChangeLog b/app-editors/leo/ChangeLog
index 982c7f4d5173..0289d6ab4c76 100644
--- a/app-editors/leo/ChangeLog
+++ b/app-editors/leo/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2007/02/21 21:20:38 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.9 2007/06/23 09:56:19 hawking Exp $
+
+  23 Jun 2007; Ali Polatel <hawking@gentoo.org> leo-4.2.ebuild,
+  leo-4.4.1_beta2.ebuild:
+  check tk support for python (bug #154459, thanks to Cliff Yapp), fix
+  headers, cosmetics
 
   21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 30c1f3edf8f3..af9d238fcd2d 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -8,18 +8,18 @@ RMD160 677d499240cb645c1d68704504c71ceb5b46367d files/leoGlobals-4.4.1_beta2.pat
 SHA256 817e652fec6114476a0cbeae7b585166a96befa2caae40db232d042bf012a363 files/leoGlobals-4.4.1_beta2.patch 706
 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
-EBUILD leo-4.2.ebuild 1040 RMD160 7441eaa9bbbaeb95075cfbb22192478f054fabdf SHA1 a177da70fcb51c0ec9d43368c9ae4ea38f5b5bf4 SHA256 d73c527ba712bcb1f4be3f338ca07f7fdc06f4b59f8af77fc3b2235102b14ef4
-MD5 f85472fdc863ffa6bd48e360fe6a135f leo-4.2.ebuild 1040
-RMD160 7441eaa9bbbaeb95075cfbb22192478f054fabdf leo-4.2.ebuild 1040
-SHA256 d73c527ba712bcb1f4be3f338ca07f7fdc06f4b59f8af77fc3b2235102b14ef4 leo-4.2.ebuild 1040
-EBUILD leo-4.4.1_beta2.ebuild 1091 RMD160 3881b1179500a147322aaa51b95548f5593eee88 SHA1 fbd7a40381547b9e111e1f8e8029325f69b6e762 SHA256 c7e8419558da05e5ca969da49e2915e5589ddac41c278067568a95931304d0e3
-MD5 929c385fc901ed8d8231285f0567ec21 leo-4.4.1_beta2.ebuild 1091
-RMD160 3881b1179500a147322aaa51b95548f5593eee88 leo-4.4.1_beta2.ebuild 1091
-SHA256 c7e8419558da05e5ca969da49e2915e5589ddac41c278067568a95931304d0e3 leo-4.4.1_beta2.ebuild 1091
-MISC ChangeLog 1097 RMD160 5b0f46430a1db718548390c0da6932996e5cefe4 SHA1 d704781e8e10bd07e2ab4cbf2e5b756744c60fbc SHA256 3c548d3a20d329d9f961aa5062d8439f67c9a6aa1e393a8f5dd5b5fba0772dcc
-MD5 ec0f3c48db708a263bbcc97adcec532d ChangeLog 1097
-RMD160 5b0f46430a1db718548390c0da6932996e5cefe4 ChangeLog 1097
-SHA256 3c548d3a20d329d9f961aa5062d8439f67c9a6aa1e393a8f5dd5b5fba0772dcc ChangeLog 1097
+EBUILD leo-4.2.ebuild 1058 RMD160 59877cfa17e106db587ae0c1d5f85ba23ad44c8d SHA1 334b6621eed6b50e8638eca24ac97135b1f94c0c SHA256 5c25d75f90d463f8b619db28255c40601ccbd2e1b8f14c017b480e5adb4098f2
+MD5 21c22a8ac8cc64f43a13327e242ee0c9 leo-4.2.ebuild 1058
+RMD160 59877cfa17e106db587ae0c1d5f85ba23ad44c8d leo-4.2.ebuild 1058
+SHA256 5c25d75f90d463f8b619db28255c40601ccbd2e1b8f14c017b480e5adb4098f2 leo-4.2.ebuild 1058
+EBUILD leo-4.4.1_beta2.ebuild 1111 RMD160 87154829db6c1395dc1f02b2d90d8e2b635b0525 SHA1 f830cbf04258b8de30d39e5c5e7ae9eef7c04293 SHA256 22a0507eaecbd5d6926c030b8da8a9ef784402a6d9d2ff57268157abade396e2
+MD5 fc560703a94543f2458cf10ea13f8419 leo-4.4.1_beta2.ebuild 1111
+RMD160 87154829db6c1395dc1f02b2d90d8e2b635b0525 leo-4.4.1_beta2.ebuild 1111
+SHA256 22a0507eaecbd5d6926c030b8da8a9ef784402a6d9d2ff57268157abade396e2 leo-4.4.1_beta2.ebuild 1111
+MISC ChangeLog 1282 RMD160 1a94f0381dc2deaef71ee1f950366da34f52479e SHA1 682363498bfa5153c382ea276e09596cda373bf9 SHA256 82f0092b522c0f30d4f02c79ba4522fac2a9c1ac6966c0ee5e34bc01553c6261
+MD5 62be9c5a5107eddbffaf8b0655316dcc ChangeLog 1282
+RMD160 1a94f0381dc2deaef71ee1f950366da34f52479e ChangeLog 1282
+SHA256 82f0092b522c0f30d4f02c79ba4522fac2a9c1ac6966c0ee5e34bc01553c6261 ChangeLog 1282
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 MD5 9ac4199ebe7cd3e7e311274994767f82 metadata.xml 160
 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb metadata.xml 160
diff --git a/app-editors/leo/leo-4.2.ebuild b/app-editors/leo/leo-4.2.ebuild
index 450d8e4239a6..129a3f7f453f 100644
--- a/app-editors/leo/leo-4.2.ebuild
+++ b/app-editors/leo/leo-4.2.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.2.ebuild,v 1.6 2005/09/16 03:06:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.2.ebuild,v 1.7 2007/06/23 09:56:19 hawking Exp $
+
+NEED_PYTHON=2.3
 
 inherit eutils python
 
 MY_P=${P}-final
 DESCRIPTION="Leo is an outlining editor and literate programming tool."
 HOMEPAGE="http://leo.sourceforge.net/"
-SRC_URI="mirror://sourceforge/leo/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="PYTHON"
 SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="virtual/python
-	dev-lang/tk"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="app-arch/unzip"
+RDEPEND=""
 
 S=${WORKDIR}/${MY_P}
 
+pkg_setup() {
+	python_tkinter_exists
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}" || die "Failed to cd ${S}"
diff --git a/app-editors/leo/leo-4.4.1_beta2.ebuild b/app-editors/leo/leo-4.4.1_beta2.ebuild
index 8751153bc2e0..44f55e64d031 100644
--- a/app-editors/leo/leo-4.4.1_beta2.ebuild
+++ b/app-editors/leo/leo-4.4.1_beta2.ebuild
@@ -1,27 +1,30 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/06/25 21:46:40 lucass Exp $
+# $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/leo/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
 
 LICENSE="PYTHON"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-RDEPEND="virtual/python
-	dev-lang/tk"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
+DEPEND="app-arch/unzip"
+RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	python_tkinter_exists
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"