1 |
arfrever 10/02/06 15:58:18 |
2 |
|
3 |
Modified: docutils-0.6_pre6148.ebuild docutils-0.5-r1.ebuild |
4 |
docutils-0.6.ebuild |
5 |
Log: |
6 |
Use $(PYTHON -f) instead of ${python}. Pass arguments to python_mod_cleanup(). |
7 |
(Portage version: 15324-svn/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 dev-python/docutils/docutils-0.6_pre6148.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: docutils-0.6_pre6148.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- docutils-0.6_pre6148.ebuild 13 Oct 2009 17:20:28 -0000 1.3 |
23 |
+++ docutils-0.6_pre6148.ebuild 6 Feb 2010 15:58:17 -0000 1.4 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2009 Gentoo Foundation |
26 |
+# Copyright 1999-2010 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild,v 1.3 2009/10/13 17:20:28 grobian Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6_pre6148.ebuild,v 1.4 2010/02/06 15:58:17 arfrever Exp $ |
30 |
|
31 |
EAPI="2" |
32 |
SUPPORT_PYTHON_ABIS="1" |
33 |
@@ -8,7 +8,7 @@ |
34 |
inherit distutils eutils multilib |
35 |
|
36 |
DESCRIPTION="Set of python tools for processing plaintext docs into HTML, XML, etc..." |
37 |
-HOMEPAGE="http://docutils.sourceforge.net/" |
38 |
+HOMEPAGE="http://docutils.sourceforge.net/ http://pypi.python.org/pypi/docutils" |
39 |
SRC_URI="mirror://gentoo/${P}.tar.bz2 |
40 |
glep? ( mirror://gentoo/glep-0.4-r1.tbz2 )" |
41 |
#mirror://sourceforge/docutils/${P}.tar.gz |
42 |
@@ -55,7 +55,7 @@ |
43 |
# generated reference to it is correct. |
44 |
cp ../docutils/writers/html4css1/html4css1.css .. |
45 |
|
46 |
- PYTHONPATH=.. ${python} ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" |
47 |
+ PYTHONPATH=.. "$(PYTHON -f)" ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" |
48 |
|
49 |
popd > /dev/null |
50 |
|
51 |
@@ -63,13 +63,6 @@ |
52 |
rm roman.py html4css1.css |
53 |
} |
54 |
|
55 |
-install_txt_doc() { |
56 |
- local doc=${1} |
57 |
- local dir="txt/$(dirname ${doc})" |
58 |
- docinto ${dir} |
59 |
- dodoc ${doc} |
60 |
-} |
61 |
- |
62 |
src_test() { |
63 |
testing() { |
64 |
# Tests are broken with Python 3. |
65 |
@@ -82,6 +75,13 @@ |
66 |
python_execute_function -s testing |
67 |
} |
68 |
|
69 |
+install_txt_doc() { |
70 |
+ local doc="${1}" |
71 |
+ local dir="txt/$(dirname ${doc})" |
72 |
+ docinto "${dir}" |
73 |
+ dodoc "${doc}" |
74 |
+} |
75 |
+ |
76 |
src_install() { |
77 |
DOCS="*.txt" |
78 |
distutils_src_install |
79 |
@@ -89,7 +89,7 @@ |
80 |
# Tools |
81 |
cd tools |
82 |
for tool in *.py; do |
83 |
- dobin ${tool} |
84 |
+ dobin "${tool}" |
85 |
done |
86 |
|
87 |
# Docs |
88 |
@@ -98,13 +98,13 @@ |
89 |
# Manually install the stylesheet file |
90 |
insinto /usr/share/doc/${PF}/html |
91 |
doins docutils/writers/html4css1/html4css1.css |
92 |
- for doc in $(find docs tools -name '*.txt'); do |
93 |
- install_txt_doc $doc |
94 |
+ for doc in $(find docs tools -name "*.txt"); do |
95 |
+ install_txt_doc "${doc}" |
96 |
done |
97 |
|
98 |
# installing Gentoo GLEP tools. Uses versioned GLEP distribution |
99 |
if use glep; then |
100 |
- dobin ${GLEP_SRC}/glep.py || die "newbin failed" |
101 |
+ dobin ${GLEP_SRC}/glep.py || die "dobin failed" |
102 |
|
103 |
installation_of_glep_tools() { |
104 |
insinto $(python_get_sitedir)/docutils/readers |
105 |
@@ -123,5 +123,5 @@ |
106 |
} |
107 |
|
108 |
pkg_postrm() { |
109 |
- python_mod_cleanup |
110 |
+ python_mod_cleanup docutils roman.py |
111 |
} |
112 |
|
113 |
|
114 |
|
115 |
1.11 dev-python/docutils/docutils-0.5-r1.ebuild |
116 |
|
117 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild?rev=1.11&view=markup |
118 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild?rev=1.11&content-type=text/plain |
119 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild?r1=1.10&r2=1.11 |
120 |
|
121 |
Index: docutils-0.5-r1.ebuild |
122 |
=================================================================== |
123 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v |
124 |
retrieving revision 1.10 |
125 |
retrieving revision 1.11 |
126 |
diff -u -r1.10 -r1.11 |
127 |
--- docutils-0.5-r1.ebuild 14 Nov 2009 16:45:09 -0000 1.10 |
128 |
+++ docutils-0.5-r1.ebuild 6 Feb 2010 15:58:17 -0000 1.11 |
129 |
@@ -1,10 +1,9 @@ |
130 |
-# Copyright 1999-2009 Gentoo Foundation |
131 |
+# Copyright 1999-2010 Gentoo Foundation |
132 |
# Distributed under the terms of the GNU General Public License v2 |
133 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.10 2009/11/14 16:45:09 armin76 Exp $ |
134 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.5-r1.ebuild,v 1.11 2010/02/06 15:58:17 arfrever Exp $ |
135 |
|
136 |
EAPI="2" |
137 |
- |
138 |
-NEED_PYTHON="2.4" |
139 |
+PYTHON_DEPEND="2" |
140 |
SUPPORT_PYTHON_ABIS="1" |
141 |
|
142 |
inherit distutils eutils multilib |
143 |
@@ -23,8 +22,7 @@ |
144 |
RDEPEND="" |
145 |
# Emacs support is in PDEPEND to avoid a dependency cycle (bug #183242) |
146 |
PDEPEND="emacs? ( || ( >=app-emacs/rst-0.4 >=virtual/emacs-23 ) )" |
147 |
- |
148 |
-RESTRICT_PYTHON_ABIS="3*" |
149 |
+RESTRICT_PYTHON_ABIS="3.*" |
150 |
|
151 |
EMP="${PN}-0.3.7" |
152 |
|
153 |
@@ -49,30 +47,22 @@ |
154 |
# make roman.py available for the doc building process |
155 |
ln -s extras/roman.py |
156 |
|
157 |
- pushd tools |
158 |
+ pushd tools > /dev/null |
159 |
|
160 |
# Place html4css1.css in base directory. This makes sure the |
161 |
# generated reference to it is correct. |
162 |
cp ../docutils/writers/html4css1/html4css1.css .. |
163 |
|
164 |
- PYTHONPATH=.. ${python} ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. \ |
165 |
- || die "buildhtml" |
166 |
+ PYTHONPATH=.. "$(PYTHON -f)" ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" |
167 |
|
168 |
- popd |
169 |
+ popd > /dev/null |
170 |
|
171 |
# clean up after the doc building |
172 |
rm roman.py html4css1.css |
173 |
} |
174 |
|
175 |
-install_txt_doc() { |
176 |
- local doc=${1} |
177 |
- local dir="txt/$(dirname ${doc})" |
178 |
- docinto ${dir} |
179 |
- dodoc ${doc} |
180 |
-} |
181 |
- |
182 |
src_test() { |
183 |
- cd "${S}/test" |
184 |
+ cd test |
185 |
|
186 |
testing() { |
187 |
PYTHONPATH="../build-${PYTHON_ABI}/lib" ./alltests.py |
188 |
@@ -80,14 +70,21 @@ |
189 |
python_execute_function testing |
190 |
} |
191 |
|
192 |
+install_txt_doc() { |
193 |
+ local doc="${1}" |
194 |
+ local dir="txt/$(dirname ${doc})" |
195 |
+ docinto "${dir}" |
196 |
+ dodoc "${doc}" |
197 |
+} |
198 |
+ |
199 |
src_install() { |
200 |
DOCS="*.txt" |
201 |
distutils_src_install |
202 |
|
203 |
# Tools |
204 |
- cd "${S}"/tools |
205 |
+ cd tools |
206 |
for tool in *.py; do |
207 |
- dobin ${tool} |
208 |
+ dobin "${tool}" |
209 |
done |
210 |
|
211 |
# Docs |
212 |
@@ -96,13 +93,13 @@ |
213 |
# Manually install the stylesheet file |
214 |
insinto /usr/share/doc/${PF}/html |
215 |
doins docutils/writers/html4css1/html4css1.css |
216 |
- for doc in $(find docs tools -name '*.txt'); do |
217 |
- install_txt_doc $doc |
218 |
+ for doc in $(find docs tools -name "*.txt"); do |
219 |
+ install_txt_doc "${doc}" |
220 |
done |
221 |
|
222 |
# installing Gentoo GLEP tools. Uses versioned GLEP distribution |
223 |
if use glep; then |
224 |
- dobin ${GLEP_SRC}/glep.py || die "newbin failed" |
225 |
+ dobin ${GLEP_SRC}/glep.py || die "dobin failed" |
226 |
|
227 |
installation_of_glep_tools() { |
228 |
insinto $(python_get_sitedir)/docutils/readers |
229 |
@@ -121,5 +118,5 @@ |
230 |
} |
231 |
|
232 |
pkg_postrm() { |
233 |
- python_mod_cleanup |
234 |
+ python_mod_cleanup docutils roman.py |
235 |
} |
236 |
|
237 |
|
238 |
|
239 |
1.5 dev-python/docutils/docutils-0.6.ebuild |
240 |
|
241 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.6.ebuild?rev=1.5&view=markup |
242 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.6.ebuild?rev=1.5&content-type=text/plain |
243 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/docutils/docutils-0.6.ebuild?r1=1.4&r2=1.5 |
244 |
|
245 |
Index: docutils-0.6.ebuild |
246 |
=================================================================== |
247 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6.ebuild,v |
248 |
retrieving revision 1.4 |
249 |
retrieving revision 1.5 |
250 |
diff -u -r1.4 -r1.5 |
251 |
--- docutils-0.6.ebuild 9 Jan 2010 00:29:16 -0000 1.4 |
252 |
+++ docutils-0.6.ebuild 6 Feb 2010 15:58:17 -0000 1.5 |
253 |
@@ -1,6 +1,6 @@ |
254 |
# Copyright 1999-2010 Gentoo Foundation |
255 |
# Distributed under the terms of the GNU General Public License v2 |
256 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6.ebuild,v 1.4 2010/01/09 00:29:16 fauli Exp $ |
257 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.6.ebuild,v 1.5 2010/02/06 15:58:17 arfrever Exp $ |
258 |
|
259 |
EAPI="2" |
260 |
SUPPORT_PYTHON_ABIS="1" |
261 |
@@ -54,7 +54,7 @@ |
262 |
# generated reference to it is correct. |
263 |
cp ../docutils/writers/html4css1/html4css1.css .. |
264 |
|
265 |
- PYTHONPATH=.. ${python} ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" |
266 |
+ PYTHONPATH=.. "$(PYTHON -f)" ./buildhtml.py --stylesheet-path=../html4css1.css --traceback .. || die "buildhtml.py failed" |
267 |
|
268 |
popd > /dev/null |
269 |
|
270 |
@@ -122,5 +122,5 @@ |
271 |
} |
272 |
|
273 |
pkg_postrm() { |
274 |
- python_mod_cleanup |
275 |
+ python_mod_cleanup docutils roman.py |
276 |
} |