bump; not py3 ready, converted to new eclass, rm old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 53 insertions, 100 deletions

diff --git a/app-editors/leo/ChangeLog b/app-editors/leo/ChangeLog
index b8c0f8245c03..651a114c4a05 100644
--- a/app-editors/leo/ChangeLog
+++ b/app-editors/leo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/leo
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.30 2014/03/24 15:05:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/ChangeLog,v 1.31 2014/12/06 11:10:19 idella4 Exp $
+
+*leo-5.0 (06 Dec 2014)
+
+  06 Dec 2014; Ian Delaney <idella4@gentoo.org> +leo-5.0.ebuild,
+  -leo-4.10.ebuild, -leo-4.8.ebuild, leo-4.11.ebuild:
+  bump; not py3 ready, converted to new eclass, rm old
 
   24 Mar 2014; Agostino Sarubbo <ago@gentoo.org> leo-4.11.ebuild:
   Stable for ppc, wrt bug #495332
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index abd2885161fd..af75b6b68bea 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -3,28 +3,16 @@ Hash: SHA256
 
 AUX leo-4.10-fix_syntax_errors.patch 717 SHA256 842b1db1abd41ec1b622de700e2a21f05e752b0c7baed0079dfd23a2cef3dff9 SHA512 0a28b3a6d1db9e10dc9c1a7a4789d4bb06777c6cf5af3b9448d28bcea6a6115f01f476026dedd09eda1bd925616001581ec710b2fcccd82888c40e55ba482528 WHIRLPOOL 277b823438a1e3d825a82ce5c982d69eeb6d7ae1ea3e74d98f317c3e917eecda7b63bfe201effc6b0b4a0b1ebc71d017d2511fefdb6069e7e27f38994f90c150
 AUX leo-4.8-fix_syntax_errors.patch 407 SHA256 269f85d72cbf3a40adc5e6c8eb9c84de50fb7439197202ed881f13e1eb8f0e6a SHA512 d5bfc7b5de0601ce63ef4d1ef4223a58d36f69a7c8f75fdc9e8005510485af1e4d601c1f7162c4ad0b7fe8fae3c6a42b402f7892a5807bc43c52309560c6e2ba WHIRLPOOL caae3930d9a14b1105cb85ee846912386d8c73240fce1076e16e4b05ad10b2e613678c992276f7b4837044f70efa5ceb3836e3aa9e61c96f52aa3a6d7f1767f1
-DIST Leo-4.10-final.zip 5467948 SHA256 3c27d28e8127094aee9a9dba3d4b5093275e5f35af1b2d3ea1e8b76e5a9f7c7b SHA512 6011b154ff63afa093c7a96b82ac6673875fd45b4f14a1347daf7cd3922f356bf397e39742fa44ad96b4c96bb08c4ecdf1e9930367cf4a5bc3619850fcffa8e5 WHIRLPOOL b9b9e15b9c104bbef257dee2b27ef86f683baff5aae95b2b1f513ecfb1eb7acd5e746220c67ec076f91287259aa4e551352cfeae9618b9e63dc7d2773b9c1049
 DIST Leo-4.11-final.zip 7282503 SHA256 eb1fd0e07533db4886fd7962a7d7431244b75239fd161395859e20a7e0f6ba62 SHA512 01bd8e433d25d16d3a824fb917da1f974a3a06fa19f25c0686031e03af62bad281fc10a62ac95ef463b0cc0acdb8c566f25b434a28dd12469cc489f4fc60e526 WHIRLPOOL 64c2d229c2a2ad6887739ee94de98c89f09d5fb1f2246fc446b4bb52496d52e412bcdf258fbbe12b85ed17372c2bd4272c246da65234114087fee02d27c7ac2b
-DIST Leo-4.8-final.zip 7278776 SHA256 50610e78c92f89e3deafb886f1aebbae127af314a9be4e1266a0e1cc76f979e0 SHA512 be48ec2d0de0aa62ea20bfa7be6887995ae1d51c8223157058023c33cf3a59b99576c25af869f2c91a41b35329850a0d264c20c6ed9c4453aab0ec86a45fd0e7 WHIRLPOOL c49db02115f5fde6ded2b4ef549223ebaec2760275c9d2bfd361978c8f69b77214686ecd3577eb837df07b79a2f603dad67b6c27b5334c13be3027e028ce1d1f
-EBUILD leo-4.10.ebuild 916 SHA256 ecb0fa3b4557bedb979f8af1273792aeeac7ba97ea54f9a052f308899e5202b5 SHA512 c42105c43b660357e07b41802e6975ab3d5a038075bd42384d939cf0dfacd799b8cd858cd577d9e90c3d385a1d49febf56041c9bb6fd76855c1db7c7c870f7b0 WHIRLPOOL 2572c3dcc5eb53f158d5951ac9b0e9aa8a55d7be83b702721e0f7eb59506079f9dd411a0548ff87e680310ab74f793196a0a6118ff2790c13589d18e1435564e
-EBUILD leo-4.11.ebuild 820 SHA256 6d660b70a20266b09d0dbfe5b3b3276e280be916b35b0ae7c6786856ca421251 SHA512 7e7230aadf2bdd31e5e2867dbc5a76c91ebb8dc5b5de59cc370d9ede8f646b646c191e24a57d46a80f5c6f2ca8d0e7b2295b516e2804ffd46e1741aac47645e9 WHIRLPOOL 530262a25c612aa61eab5f8a43c6562dc67d49fa2a6682cfb854639ac031db7685950de83a47ca6371b592a0c3852d8524dd9014be69ca516f61311f9ddb7ddf
-EBUILD leo-4.8.ebuild 912 SHA256 9f5bc1608e43bea0d812ea4bf428b3ed23e1e51092a88edbc278c40335303dee SHA512 d80b31a40d6f6bcc674e9a29d18f4eb4b2eaceae5aff82714f87084403c9ff5d6035b783d630ed9fd9c8e98b63edf5f67a8dfbebf73a93443d8e1b801c42683a WHIRLPOOL 55b9a14f3feee22748f0235eb2405e1748853929ad0eb0cc368de677ea426fdce677f5ba22e08615bc993169ee3d749f8e460b91a0b629c151bcdf968acbd6cb
-MISC ChangeLog 4021 SHA256 1c44ab85bd48dc34c64a3d863a496c3b6fb360657c77f59a1dd73a3d8556510b SHA512 8d3685f627d15bb3c2e438e52f2854495cfceb9658caeef1f7d4fff11b479cff91dcdd0bb187e3356452afeb2053c0fc3974bc093d150a73bd151287f94334e2 WHIRLPOOL 361d22cec9b24ea44cde5cad1989daac5c6733af9401a19629bb3a78f1315d3d5888d1533002a191733cbcc32b965a5fe59cadf2b8b789fff7ae9e8cab40a1f9
+DIST Leo-5.0-final.zip 8628999 SHA256 5635ac753b011a43a3096e5dc18e2d5c6e9f628a40c0ba628c789bccb10928d1 SHA512 771b00857143ea6de48bc0f1ace5c4518265462c8720a5b52868cf0490f4de7f4d987fd939141e00bf0c7abaddf1cb4b18a6186151739f6ec2024fd50d564c6e WHIRLPOOL b9cc3c22dcc4da204a00cdd2eec48f3e001cd5e4ba20e730f4bef0aadbc4e6c6f03521e1e04bc313b8f29479f1e839dbaac322af8b32a99bb46304677f135db1
+EBUILD leo-4.11.ebuild 825 SHA256 1d54769e60848dd717649d318c581c9504365b95fcc5cf86ba350e22f2d0fb62 SHA512 46bafb6605a62783358548205d53210705cdea70e9ca13b6eb05eda739c86f3cfe77bce778cc1599e615569d7ac0517e5d6f43d6cdded00e102511ea618d57f9 WHIRLPOOL c6f662ad38815bdef6e78689b258855bf9b0902ac67521cc8f4dbf868b680283830e1012f5e418a2cfde627f75d6c8648fc19e7f8f9950e1eefb6e97ac738c57
+EBUILD leo-5.0.ebuild 885 SHA256 67e4ee7bb7725576a09e14ec8b0cac839541d63706b8f80b7944a2e147d8d813 SHA512 928efc87483c37d4803f9913b6f8aed2b3b219cd123d2b0420e47f7bd7abc1b96a3e455953ff4fead9e8c38684de8f7dae9ebeeea9e610770ea6f28b3910b89b WHIRLPOOL aa321272dff0fa7a20404cb4f5fc8e932496fc5259c789c8a7a4eda75c1c277e53fdd93979eed0b440237e5f8be02ec206b56db85e9ecff056e65c2424479a6e
+MISC ChangeLog 4224 SHA256 b71ca93c6664d0fc29cedf96ec1c74fc6f31f49884cbaae77045554cf8e76d48 SHA512 f0662c01584ef02ff98228882641b272c2586227a390fe353f59d6f5266a24978aeab189676dde226e9700fcf732ae95b30628fa169c52012e17c98354deec7a WHIRLPOOL 8fb17d81c51b04ceb55a9e8f1dde30f9a7d63e1241299ee18064b37c54610280928a77c4c08fd4b9e01858942d6b11ff11ca0821823fdc1913cfe34a200e723c
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTMEmyAAoJELp701BxlEWfXIUP/jmNwb4LZod+4vAqk5KdJZBU
-uD4+z7h4hOywBp+XBsFgxwacKUaEdgoGk1fU/pPmfOZeeJGQjUE31G1P8AT0aXBA
-+V5lgtmsMFrwLw4zaLJ1/i7gr8B1eExcPhO47bTVtX5UFmwxvzQAypxIF1CyeHTW
-7KVvqZlLo5x3yN03TzmhWOax1gDxye9wWsvCqmK7wNva0bj2gmwKGVbMQr8yYDJu
-9kdN4hS1c9Djl13D8JDA/3q9ZDTr32oPdjyoG/rzU8KbJLINGoaNrtqWlOiux/e7
-Kft7SKDgWq0nY/LQ/pIGXLbZ5LzJeZUVPyqd0oFXtIa3SO8yEBn0UmDmotK7qZTd
-H0JmvsyAFnVbwqgc0EOG3bS3r1ZCTszOGU6peqnDfQaY8cyjcfK3ugk8eEBLlxP1
-ClOxNFii6a4evs303xLKpwAigCyYfl+6J6shw9Sq5rL9nGzYlGAta7vZgKcOni2C
-a+0Xbv6d5LRNvrP3oKOiINP55IrXKOzVKPZsp6RIUjMRrdJGewTJHzD3o3Nv3jDM
-CTLrsGZqzCfcV7lAB3rn3QfvjYSqpMMEM7nmMqC78fI+AfrxUpxCiQqNlTZwl7Ar
-hgvWfWwE+oB/xWW6T+eF9mIdmfhlv+pQ4hkR9hYbQmk1ArmE4gUWpxeHE6QBKjFM
-O7uZTFSj75dXCFYDaiGt
-=u0NE
+iEYEAREIAAYFAlSC5CsACgkQso7CE7gHKw2U/QCbBfK1VaFlkkCwZqEm0V9+lme/
+E74Aniktd0TlHL5RFXBwbJfyc2PtyI77
+=uLkE
 -----END PGP SIGNATURE-----
diff --git a/app-editors/leo/leo-4.10.ebuild b/app-editors/leo/leo-4.10.ebuild
deleted file mode 100644
index 0947366f9558..000000000000
--- a/app-editors/leo/leo-4.10.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.10.ebuild,v 1.2 2012/11/01 10:12:09 ulm Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="tk"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-pypy-* *-jython"
-
-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="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-text/silvercity
-	dev-python/PyQt4[X]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-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"
-}
diff --git a/app-editors/leo/leo-4.11.ebuild b/app-editors/leo/leo-4.11.ebuild
index caeb6ca9c6be..91fb5bca1a0b 100644
--- a/app-editors/leo/leo-4.11.ebuild
+++ b/app-editors/leo/leo-4.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.11.ebuild,v 1.4 2014/03/24 15:05:21 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.11.ebuild,v 1.5 2014/12/06 11:10:19 idella4 Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -23,6 +23,7 @@ IUSE=""
 
 RDEPEND="app-text/silvercity
 	dev-python/PyQt4[X]"
+
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
diff --git a/app-editors/leo/leo-4.8.ebuild b/app-editors/leo/leo-4.8.ebuild
deleted file mode 100644
index c3c2de666d95..000000000000
--- a/app-editors/leo/leo-4.8.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-4.8.ebuild,v 1.6 2012/11/01 10:12:09 ulm Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="tk"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-pypy-* *-jython"
-
-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="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="app-text/silvercity
-	dev-python/PyQt4[X]"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-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"
-}
diff --git a/app-editors/leo/leo-5.0.ebuild b/app-editors/leo/leo-5.0.ebuild
new file mode 100644
index 000000000000..e5330a9bb0fd
--- /dev/null
+++ b/app-editors/leo/leo-5.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leo/leo-5.0.ebuild,v 1.1 2014/12/06 11:10:19 idella4 Exp $
+
+EAPI=5
+
+# Not py3 prepared
+# https://bugs.launchpad.net/leo-editor/+bug/1399895
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQUIRED_USE="tk"
+
+inherit distutils-r1
+
+MY_P="Leo-${PV}-final"
+MY_PN="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="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="app-text/silvercity
+	dev-python/PyQt4[X,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}"
+
+python_install_all() {
+	use doc && local HTML_DOCS=( leo/doc/html/. )
+	distutils-r1_python_install_all
+}