diff options
| author |   Ian Delaney <idella4@gentoo.org> | 2014-06-04 06:51:31 +0000 |
|---|---|---|
| committer | Ian Delaney <idella4@gentoo.org> | 2014-06-04 06:51:31 +0000 |
| commit | 5fe79a37e76c8ec3937519e4f874fa129a458f17 (patch) | |
| tree | f7a224860b225c3971e2a3ceb3f7a9b827b14c30 | |
| parent | Version bump. Removed old. (diff) | |
| download | gentoo-2-5fe79a37e76c8ec3937519e4f874fa129a458f17.tar.gz gentoo-2-5fe79a37e76c8ec3937519e4f874fa129a458f17.tar.bz2 gentoo-2-5fe79a37e76c8ec3937519e4f874fa129a458f17.zip | |
Fix epydoc doc build, fixes Bug #512112
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
| -rw-r--r-- | dev-python/logilab-common/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/logilab-common/logilab-common-0.61.0.ebuild | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/dev-python/logilab-common/ChangeLog b/dev-python/logilab-common/ChangeLog index 50dbd1e5aac8..03bfa8b62197 100644 --- a/dev-python/logilab-common/ChangeLog +++ b/dev-python/logilab-common/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/logilab-common # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.142 2014/05/08 05:41:50 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.143 2014/06/04 06:51:31 idella4 Exp $ + + 04 Jun 2014; Ian Delaney <idella4@gentoo.org> logilab-common-0.61.0.ebuild: + Fix epydoc doc build, fixes Bug #512112 08 May 2014; Ian Delaney <idella4@gentoo.org> logilab-common-0.61.0.ebuild: drop py2.6 pypy2_0 add py3.4 support, minor tidy, upgrade test phase diff --git a/dev-python/logilab-common/logilab-common-0.61.0.ebuild b/dev-python/logilab-common/logilab-common-0.61.0.ebuild index f821d01b993b..e844184d2fdd 100644 --- a/dev-python/logilab-common/logilab-common-0.61.0.ebuild +++ b/dev-python/logilab-common/logilab-common-0.61.0.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/dev-python/logilab-common/logilab-common-0.61.0.ebuild,v 1.7 2014/05/08 05:41:50 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.61.0.ebuild,v 1.8 2014/06/04 06:51:31 idella4 Exp $ EAPI=5 @@ -24,10 +24,10 @@ RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}] # egenix-mx-base tests are optional and supports python2 only. DEPEND="${RDEPEND} test? ( - $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' 'python2*') + $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) !dev-python/psycopg[-mxdatetime] ) - doc? ( dev-python/epydoc )" + doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )" PATCHES=( # Make sure setuptools does not create a zip file in python_test; @@ -47,10 +47,12 @@ python_prepare_all() { python_compile_all() { if use doc; then - # Simplest way to make makefile point to the right place. - ln -s "${BUILD_DIR}" build || die - emake -C doc epydoc - rm build || die + # Based on the doc build in Arfrever's ebuild. It works + pushd doc > /dev/null + mkdir -p apidoc || die + epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \ + -n "Logilab's common library" "$(ls -d ../build//lib/logilab/common/)" build \ + || die "Generation of documentation failed" fi } |