Gentoo Archives: gentoo-commits

From: "Arfrever Frehtes Taifersar Arahesis (arfrever)" <arfrever@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/pastescript: ChangeLog pastescript-1.7.3.ebuild
Date: Sun, 27 Jun 2010 22:59:37
Message-Id: 20100627225932.9CBEB2CF9C@corvid.gentoo.org
1 arfrever 10/06/27 22:59:32
2
3 Modified: ChangeLog pastescript-1.7.3.ebuild
4 Log:
5 Fix building with USE="doc".
6 (Portage version: HEAD/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.9 dev-python/pastescript/ChangeLog
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastescript/ChangeLog?rev=1.9&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastescript/ChangeLog?rev=1.9&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastescript/ChangeLog?r1=1.8&r2=1.9
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v
18 retrieving revision 1.8
19 retrieving revision 1.9
20 diff -u -r1.8 -r1.9
21 --- ChangeLog 11 Oct 2009 08:28:57 -0000 1.8
22 +++ ChangeLog 27 Jun 2010 22:59:32 -0000 1.9
23 @@ -1,6 +1,10 @@
24 # ChangeLog for dev-python/pastescript
25 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.8 2009/10/11 08:28:57 grobian Exp $
27 +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
28 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/ChangeLog,v 1.9 2010/06/27 22:59:32 arfrever Exp $
29 +
30 + 27 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
31 + pastescript-1.7.3.ebuild:
32 + Fix building with USE="doc".
33
34 11 Oct 2009; Fabian Groffen <grobian@g.o> pastescript-1.7.3.ebuild:
35 Merge from Prefix
36
37
38
39 1.5 dev-python/pastescript/pastescript-1.7.3.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild?rev=1.5&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild?rev=1.5&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild?r1=1.4&r2=1.5
44
45 Index: pastescript-1.7.3.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v
48 retrieving revision 1.4
49 retrieving revision 1.5
50 diff -u -r1.4 -r1.5
51 --- pastescript-1.7.3.ebuild 6 Feb 2010 15:40:07 -0000 1.4
52 +++ pastescript-1.7.3.ebuild 27 Jun 2010 22:59:32 -0000 1.5
53 @@ -1,10 +1,12 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.4 2010/02/06 15:40:07 arfrever Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pastescript/pastescript-1.7.3.ebuild,v 1.5 2010/06/27 22:59:32 arfrever Exp $
58
59 -EAPI="2"
60 +EAPI="3"
61 PYTHON_DEPEND="2"
62 SUPPORT_PYTHON_ABIS="1"
63 +RESTRICT_PYTHON_ABIS="3.*"
64 +DISTUTILS_SRC_TEST="nosetests"
65
66 inherit distutils
67
68 @@ -19,39 +21,37 @@
69 SLOT="0"
70 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-macos"
71 IUSE="doc"
72 -#IUSE="doc test"
73
74 -RDEPEND="dev-python/paste
75 +RDEPEND=">=dev-python/paste-1.3
76 dev-python/pastedeploy
77 dev-python/cheetah"
78 DEPEND="${RDEPEND}
79 dev-python/setuptools
80 - doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge )"
81 -# test? ( dev-python/nose )
82 -RESTRICT_PYTHON_ABIS="3.*"
83 + doc? ( dev-python/pygments dev-python/sphinx )"
84
85 # Tests are broken.
86 RESTRICT="test"
87
88 S="${WORKDIR}/${MY_P}"
89 +
90 PYTHON_MODNAME="paste/script"
91
92 src_compile() {
93 distutils_src_compile
94 +
95 if use doc; then
96 - einfo "Generating docs as requested..."
97 - PYTHONPATH=. "$(PYTHON -f)" setup.py pudge || die "generating docs failed"
98 + einfo "Generation of documentation"
99 + PYTHONPATH="." "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed"
100 fi
101 }
102
103 -src_test() {
104 - testing() {
105 - PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests-${PYTHON_ABI}
106 - }
107 - python_execute_function testing
108 -}
109 -
110 src_install() {
111 distutils_src_install
112 - use doc && dohtml -r docs/html/*
113 +
114 + if use doc; then
115 + pushd build/sphinx/html > /dev/null
116 + docinto html
117 + cp -R [a-z]* _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed"
118 + popd > /dev/null
119 + fi
120 }