Fix dependencies.

Package-Manager: portage-HEAD/cvs/Linux x86_64

diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
index 52755167d686151434ebe5605d199cdcfa3288d8..8ee1de0d2023e35ea3e1c9b2cb42253603113573 100644 (file)
--- a/dev-python/epydoc/Manifest
+++ b/dev-python/epydoc/Manifest
@@ -2,8 +2,8 @@ AUX epydoc-docutils-0.6.patch 1189 RMD160 b336e7af249f21b1bc520c943e089d8a150e50
 AUX epydoc-python-2.6.patch 2425 RMD160 6b81cd0868cd37bca5cbe3d146e94871fe2f9d64 SHA1 db9e79f0b472716d81d6462de667545df7ffb2a2 SHA256 c1e3ef61ba2ba70918c9f535c4c515eaba353e79c9cbe2f3071734434c045751
 DIST epydoc-2.1.tar.gz 529943 RMD160 50b8a546cf22acd82e7ccbc3f5a8dc111534b5cf SHA1 f2034c5e1b9cf0d2d16e0b9c8af0d3581af524e4 SHA256 cf1e915810f7b34c1315a41e9aa82b570ab2a7f49edbdbaaec4725e8d543c04a
 DIST epydoc-3.0.1.tar.gz 1785792 RMD160 7630a4f6e4ef5f1e2b033f38316ed992306cb951 SHA1 ccd5cb602cbf8df1a6c61670793d0122fc569523 SHA256 d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1
-EBUILD epydoc-2.1-r2.ebuild 821 RMD160 dc6455ff1bc4aabaf24e2d4ca8121bba56e26e54 SHA1 11e9fbe80f23348db1d05cff7ef5c0c580e2a9da SHA256 5cc7708547b3edcef6e8e1dfdb185094ac05fed9b23bd426d871285ea01f8552
-EBUILD epydoc-3.0.1-r1.ebuild 1325 RMD160 143bdb2d7de033df8c069191a03c0cfde74e15f0 SHA1 6292bfba9fb3bfde075ed2b1dd97023dd76a1acd SHA256 35a9f716a4db66a4f62f6e8ef1ccbcabfebce93b13a7568193b6427a706ce385
+EBUILD epydoc-2.1-r2.ebuild 838 RMD160 5d7e9c43c36f4bc3bd83879c4bfa1a514662d8a8 SHA1 98ed195a113aefd5eb1702414afa7d7181cd1bca SHA256 4b1dc89bc9773cc2443bdb12bb26300776e7f58f13f086cac3a2313a435d7ca1
+EBUILD epydoc-3.0.1-r1.ebuild 1177 RMD160 f4ef3d688652f02d1be597e7baa78bd7f5c8d673 SHA1 92c4e60c94019c67b58fe16b0b80a4c8c50da16b SHA256 11d10d0c2c2332ac0a38fd52be1192a6954a83da6cc50fcb143934d9d562e08d
 EBUILD epydoc-3.0.1.ebuild 1019 RMD160 26fbcb35a0241f22718dcacc7c6b9f1b604bd5ac SHA1 ea1f84e6343d0948df1cc2d6b502eec75b4e919c SHA256 547b351b7d510d7f36bf5bbf74bbc5f1de99d2601cd8fe784b8123afac2ef14b
 MISC ChangeLog 5909 RMD160 c21bfbb6b64ebfd95d89af60519b25ecfb776786 SHA1 25f25e002f2be24b82e60031647ced7de5d96957 SHA256 e1f3bc088de157226450ee66c8a3c85660f80fc03abc7d5e984c30cf87ad0f6c
 MISC metadata.xml 1070 RMD160 50fbf351b06775908755ae4436d6352cd5ffdbf3 SHA1 5b01cd363e28a60f952c23954e7f12b882e482ed SHA256 34074c2fb16e86fbf182512c108afebe0c24fc143bb69044028bfa4e7dc2cb7a

diff --git a/dev-python/epydoc/epydoc-2.1-r2.ebuild b/dev-python/epydoc/epydoc-2.1-r2.ebuild
index f3327e4a349fe494f7ebf4b310bb15d156a17ddd..2f91aa307bb2bbc59ccde27f0a9db057d70a361b 100644 (file)
--- a/dev-python/epydoc/epydoc-2.1-r2.ebuild
+++ b/dev-python/epydoc/epydoc-2.1-r2.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-2.1-r2.ebuild,v 1.20 2009/10/03 05:33:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-2.1-r2.ebuild,v 1.21 2010/05/02 19:00:24 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
 
 inherit distutils
 
 DESCRIPTION="Tool for generating API documentation for Python modules, based on their docstrings"
 HOMEPAGE="http://epydoc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/epydoc/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"

diff --git a/dev-python/epydoc/epydoc-3.0.1-r1.ebuild b/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
index 8be4e805497f4549866c2b6a78db18d56205eda8..4ab1f4844414f009d1b02ec0360e4459af80ca85 100644 (file)
--- a/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
+++ b/dev-python/epydoc/epydoc-3.0.1-r1.ebuild
@@ -1,11 +1,14 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r1.ebuild,v 1.2 2010/02/08 08:50:03 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/epydoc/epydoc-3.0.1-r1.ebuild,v 1.3 2010/05/02 19:00:24 arfrever Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+PYTHON_USE_WITH_OPT="X"
 SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils distutils
+inherit distutils eutils
 
 DESCRIPTION="Tool for generating API documentation for Python modules, based on their docstrings"
 HOMEPAGE="http://epydoc.sourceforge.net/"
@@ -20,21 +23,16 @@ DEPEND=""
 RDEPEND="dev-python/docutils
        latex? ( virtual/latex-base
                || ( dev-texlive/texlive-latexextra app-text/ptex )
-       )
-       X? ( dev-lang/python[tk] )"
+       )"
 RESTRICT_PYTHON_ABIS="3.*"
 
 src_prepare() {
-       # bug #287546, thanks to Engelbert Gruber <grubert@users.sourceforge.net>
-       # and Martin von Gagern <Martin.vGagern@gmx.net>
-       epatch "${FILESDIR}"/${PN}-docutils-0.6.patch
-
-       # bug #288273, thanks to Andre Malo <nd@perlig.de>
-       epatch "${FILESDIR}"/${PN}-python-2.6.patch
+       distutils_src_prepare
+       epatch "${FILESDIR}/${PN}-docutils-0.6.patch"
+       epatch "${FILESDIR}/${PN}-python-2.6.patch"
 }
 
 src_install() {
-       [[ -z ${ED} ]] && local ED=${D}
        distutils_src_install
 
        doman man/*