| 1 |
idella4 14/06/04 06:51:31 |
| 2 |
|
| 3 |
Modified: logilab-common-0.61.0.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix epydoc doc build, fixes Bug #512112 |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.8 dev-python/logilab-common/logilab-common-0.61.0.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/logilab-common/logilab-common-0.61.0.ebuild?rev=1.8&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/logilab-common/logilab-common-0.61.0.ebuild?rev=1.8&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/logilab-common/logilab-common-0.61.0.ebuild?r1=1.7&r2=1.8 |
| 15 |
|
| 16 |
Index: logilab-common-0.61.0.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/logilab-common/logilab-common-0.61.0.ebuild,v |
| 19 |
retrieving revision 1.7 |
| 20 |
retrieving revision 1.8 |
| 21 |
diff -u -r1.7 -r1.8 |
| 22 |
--- logilab-common-0.61.0.ebuild 8 May 2014 05:41:50 -0000 1.7 |
| 23 |
+++ logilab-common-0.61.0.ebuild 4 Jun 2014 06:51:31 -0000 1.8 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $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 $ |
| 28 |
+# $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 $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -24,10 +24,10 @@ |
| 33 |
# egenix-mx-base tests are optional and supports python2 only. |
| 34 |
DEPEND="${RDEPEND} |
| 35 |
test? ( |
| 36 |
- $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' 'python2*') |
| 37 |
+ $(python_gen_cond_dep 'dev-python/egenix-mx-base[${PYTHON_USEDEP}]' python2_7) |
| 38 |
!dev-python/psycopg[-mxdatetime] |
| 39 |
) |
| 40 |
- doc? ( dev-python/epydoc )" |
| 41 |
+ doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) )" |
| 42 |
|
| 43 |
PATCHES=( |
| 44 |
# Make sure setuptools does not create a zip file in python_test; |
| 45 |
@@ -47,10 +47,12 @@ |
| 46 |
|
| 47 |
python_compile_all() { |
| 48 |
if use doc; then |
| 49 |
- # Simplest way to make makefile point to the right place. |
| 50 |
- ln -s "${BUILD_DIR}" build || die |
| 51 |
- emake -C doc epydoc |
| 52 |
- rm build || die |
| 53 |
+ # Based on the doc build in Arfrever's ebuild. It works |
| 54 |
+ pushd doc > /dev/null |
| 55 |
+ mkdir -p apidoc || die |
| 56 |
+ epydoc --parse-only -o apidoc --html -v --no-private --exclude=__pkginfo__ --exclude=setup --exclude=test \ |
| 57 |
+ -n "Logilab's common library" "$(ls -d ../build//lib/logilab/common/)" build \ |
| 58 |
+ || die "Generation of documentation failed" |
| 59 |
fi |
| 60 |
} |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.143 dev-python/logilab-common/ChangeLog |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/logilab-common/ChangeLog?rev=1.143&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/logilab-common/ChangeLog?rev=1.143&content-type=text/plain |
| 69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/logilab-common/ChangeLog?r1=1.142&r2=1.143 |
| 70 |
|
| 71 |
Index: ChangeLog |
| 72 |
=================================================================== |
| 73 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v |
| 74 |
retrieving revision 1.142 |
| 75 |
retrieving revision 1.143 |
| 76 |
diff -u -r1.142 -r1.143 |
| 77 |
--- ChangeLog 8 May 2014 05:41:50 -0000 1.142 |
| 78 |
+++ ChangeLog 4 Jun 2014 06:51:31 -0000 1.143 |
| 79 |
@@ -1,6 +1,9 @@ |
| 80 |
# ChangeLog for dev-python/logilab-common |
| 81 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 82 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.142 2014/05/08 05:41:50 idella4 Exp $ |
| 83 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/logilab-common/ChangeLog,v 1.143 2014/06/04 06:51:31 idella4 Exp $ |
| 84 |
+ |
| 85 |
+ 04 Jun 2014; Ian Delaney <idella4@g.o> logilab-common-0.61.0.ebuild: |
| 86 |
+ Fix epydoc doc build, fixes Bug #512112 |
| 87 |
|
| 88 |
08 May 2014; Ian Delaney <idella4@g.o> logilab-common-0.61.0.ebuild: |
| 89 |
drop py2.6 pypy2_0 add py3.4 support, minor tidy, upgrade test phase |
Archives