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/django: django-1.0.4.ebuild django-1.1.2.ebuild django-9999.ebuild
Date: Wed, 26 May 2010 17:58:16
Message-Id: 20100526175812.C981B2CEF0@corvid.gentoo.org
1 arfrever 10/05/26 17:58:12
2
3 Modified: django-1.0.4.ebuild django-1.1.2.ebuild
4 django-9999.ebuild
5 Log:
6 Synchronize ebuilds.
7
8 Revision Changes Path
9 1.2 dev-python/django/django-1.0.4.ebuild
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.0.4.ebuild?rev=1.2&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.0.4.ebuild?rev=1.2&content-type=text/plain
13 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.0.4.ebuild?r1=1.1&r2=1.2
14
15 Index: django-1.0.4.ebuild
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v
18 retrieving revision 1.1
19 retrieving revision 1.2
20 diff -u -r1.1 -r1.2
21 --- django-1.0.4.ebuild 9 Oct 2009 23:05:00 -0000 1.1
22 +++ django-1.0.4.ebuild 26 May 2010 17:58:12 -0000 1.2
23 @@ -1,21 +1,22 @@
24 -# Copyright 1999-2009 Gentoo Foundation
25 +# Copyright 1999-2010 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v 1.1 2009/10/09 23:05:00 patrick Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.4.ebuild,v 1.2 2010/05/26 17:58:12 arfrever Exp $
29
30 -EAPI="2"
31 +EAPI="3"
32 +PYTHON_DEPEND="2"
33 +SUPPORT_PYTHON_ABIS="1"
34
35 -inherit bash-completion distutils multilib versionator webapp
36 +inherit bash-completion distutils webapp
37
38 -MY_P="${P/#d/D}"
39 -WEBAPP_MANUAL_SLOT="yes"
40 +MY_P="Django-${PV}"
41
42 DESCRIPTION="High-level python web framework"
43 -HOMEPAGE="http://www.djangoproject.com/"
44 +HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
45 SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz"
46
47 LICENSE="BSD"
48 SLOT="0"
49 -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
50 +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
51 IUSE="doc examples mysql postgres sqlite test"
52
53 RDEPEND="dev-python/imaging
54 @@ -31,58 +32,62 @@
55 >=dev-lang/python-2.5[sqlite]
56 ( dev-python/pysqlite:2 <dev-lang/python-2.5 )
57 ) )"
58 +RESTRICT_PYTHON_ABIS="3.*"
59
60 S="${WORKDIR}/${MY_P}"
61
62 -PYTHON_MODNAME="django"
63 -
64 DOCS="docs/* AUTHORS"
65 +WEBAPP_MANUAL_SLOT="yes"
66 +
67 +pkg_setup() {
68 + python_pkg_setup
69 + webapp_pkg_setup
70 +}
71
72 src_compile() {
73 distutils_src_compile
74
75 - if use doc ; then
76 + if use doc; then
77 pushd docs > /dev/null
78 - emake html || die "Generation of HTML documentation failed"
79 + einfo "Generation of documentation"
80 + emake html || die "Generation of documentation failed"
81 popd > /dev/null
82 fi
83 }
84
85 src_test() {
86 - einfo "Running tests."
87 - cat >> tests/settings.py << __EOF__
88 + testing() {
89 + cat >> tests/settings.py << __EOF__
90 DATABASE_ENGINE='sqlite3'
91 DATABASE_NAME='test.db'
92 ROOT_URLCONF='tests/urls.py'
93 SITE_ID=1
94 __EOF__
95 - PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
96 + # Tests have non-standard assumptions about PYTHONPATH and
97 + # don't work with usual "build-${PYTHON_ABI}/lib".
98 + PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1
99 + }
100 + python_execute_function testing
101 }
102
103 src_install() {
104 - distutils_python_version
105 - site_pkgs="$(python_get_sitedir)"
106 - export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
107 - dodir ${site_pkgs}
108 -
109 distutils_src_install
110
111 dobashcompletion extras/django_bash_completion
112
113 - if use examples ; then
114 + if use examples; then
115 insinto /usr/share/doc/${PF}
116 doins -r examples
117 fi
118
119 - if use doc ; then
120 - mv docs/_build/html/{_,.}sources
121 - dohtml txt -r docs/_build/html/*
122 + if use doc; then
123 + rm -fr docs/_build/html/_sources
124 + dohtml -A txt -r docs/_build/html/*
125 fi
126
127 - insinto "${MY_HTDOCSDIR}"
128 - doins -r "${D}/${site_pkgs}"/django/contrib/admin/media/*
129 + insinto "${MY_HTDOCSDIR#${EPREFIX}}"
130 + doins -r django/contrib/admin/media/* || die "doins failed"
131
132 - #webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt
133 webapp_src_install
134 }
135
136 @@ -93,6 +98,7 @@
137 pkg_postinst() {
138 bash-completion_pkg_postinst
139 distutils_pkg_postinst
140 +
141 einfo "Now, Django has the best of both worlds with Gentoo,"
142 einfo "ease of deployment for production and development."
143 echo
144 @@ -101,7 +107,6 @@
145 elog "as well as the traditional location in python's"
146 elog "site-packages dir for easy development"
147 echo
148 - echo
149 ewarn "If you build Django ${PV} without USE=\"vhosts\""
150 ewarn "webapp-config will automatically install the"
151 ewarn "admin media into the localhost webroot."
152
153
154
155 1.2 dev-python/django/django-1.1.2.ebuild
156
157 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.1.2.ebuild?rev=1.2&view=markup
158 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.1.2.ebuild?rev=1.2&content-type=text/plain
159 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.1.2.ebuild?r1=1.1&r2=1.2
160
161 Index: django-1.1.2.ebuild
162 ===================================================================
163 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.2.ebuild,v
164 retrieving revision 1.1
165 retrieving revision 1.2
166 diff -u -r1.1 -r1.2
167 --- django-1.1.2.ebuild 14 May 2010 19:29:43 -0000 1.1
168 +++ django-1.1.2.ebuild 26 May 2010 17:58:12 -0000 1.2
169 @@ -1,19 +1,18 @@
170 # Copyright 1999-2010 Gentoo Foundation
171 # Distributed under the terms of the GNU General Public License v2
172 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.2.ebuild,v 1.1 2010/05/14 19:29:43 arfrever Exp $
173 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.2.ebuild,v 1.2 2010/05/26 17:58:12 arfrever Exp $
174
175 EAPI="3"
176 PYTHON_DEPEND="2"
177 SUPPORT_PYTHON_ABIS="1"
178
179 -inherit bash-completion distutils webapp
180 +inherit bash-completion distutils versionator webapp
181
182 -MY_PN="Django"
183 -MY_P="${MY_PN}-${PV}"
184 +MY_P="Django-${PV}"
185
186 DESCRIPTION="High-level python web framework"
187 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
188 -SRC_URI="http://pypi.python.org/packages/source/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
189 +SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
190
191 LICENSE="BSD"
192 SLOT="0"
193 @@ -41,6 +40,7 @@
194 WEBAPP_MANUAL_SLOT="yes"
195
196 pkg_setup() {
197 + python_pkg_setup
198 webapp_pkg_setup
199 }
200
201 @@ -81,8 +81,8 @@
202 fi
203
204 if use doc; then
205 - mv docs/_build/html/{_,.}sources
206 - dohtml txt -r docs/_build/html/*
207 + rm -fr docs/_build/html/_sources
208 + dohtml -A txt -r docs/_build/html/*
209 fi
210
211 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
212 @@ -98,6 +98,7 @@
213 pkg_postinst() {
214 bash-completion_pkg_postinst
215 distutils_pkg_postinst
216 +
217 einfo "Now, Django has the best of both worlds with Gentoo,"
218 einfo "ease of deployment for production and development."
219 echo
220 @@ -106,7 +107,6 @@
221 elog "as well as the traditional location in python's"
222 elog "site-packages dir for easy development"
223 echo
224 - echo
225 ewarn "If you build Django ${PV} without USE=\"vhosts\""
226 ewarn "webapp-config will automatically install the"
227 ewarn "admin media into the localhost webroot."
228
229
230
231 1.6 dev-python/django/django-9999.ebuild
232
233 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.6&view=markup
234 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.6&content-type=text/plain
235 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.5&r2=1.6
236
237 Index: django-9999.ebuild
238 ===================================================================
239 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
240 retrieving revision 1.5
241 retrieving revision 1.6
242 diff -u -r1.5 -r1.6
243 --- django-9999.ebuild 3 Aug 2009 05:10:34 -0000 1.5
244 +++ django-9999.ebuild 26 May 2010 17:58:12 -0000 1.6
245 @@ -1,15 +1,17 @@
246 -# Copyright 1999-2009 Gentoo Foundation
247 +# Copyright 1999-2010 Gentoo Foundation
248 # Distributed under the terms of the GNU General Public License v2
249 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.5 2009/08/03 05:10:34 arfrever Exp $
250 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.6 2010/05/26 17:58:12 arfrever Exp $
251
252 -EAPI="2"
253 +EAPI="3"
254 +PYTHON_DEPEND="2"
255 +SUPPORT_PYTHON_ABIS="1"
256
257 -ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/"
258 -
259 -inherit bash-completion distutils eutils subversion versionator
260 +inherit bash-completion distutils subversion webapp
261
262 DESCRIPTION="High-level python web framework"
263 -HOMEPAGE="http://www.djangoproject.com/"
264 +HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
265 +SRC_URI=""
266 +
267 LICENSE="BSD"
268 SLOT="0"
269 KEYWORDS=""
270 @@ -28,58 +30,84 @@
271 >=dev-lang/python-2.5[sqlite]
272 ( dev-python/pysqlite:2 <dev-lang/python-2.5 )
273 ) )"
274 +RESTRICT_PYTHON_ABIS="3.*"
275
276 S="${WORKDIR}"
277
278 -PYTHON_MODNAME="django"
279 +ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/"
280 +
281 +DOCS="docs/* AUTHORS"
282 +WEBAPP_MANUAL_SLOT="yes"
283
284 -DOCS="docs/*.txt AUTHORS"
285 +pkg_setup() {
286 + python_pkg_setup
287 + webapp_pkg_setup
288 +}
289
290 src_compile() {
291 distutils_src_compile
292
293 - if use doc ; then
294 + if use doc; then
295 pushd docs > /dev/null
296 - emake html || die "Generation of HTML documentation failed"
297 + einfo "Generation of documentation"
298 + emake html || die "Generation of documentation failed"
299 popd > /dev/null
300 fi
301 }
302
303 src_test() {
304 - einfo "Running tests."
305 - cat >> tests/settings.py << __EOF__
306 + testing() {
307 + cat >> tests/settings.py << __EOF__
308 DATABASE_ENGINE='sqlite3'
309 DATABASE_NAME='test.db'
310 ROOT_URLCONF='tests/urls.py'
311 SITE_ID=1
312 __EOF__
313 -
314 - elog "Please note: You're using a live SVN ebuild."
315 - elog "We therefore won't fix any failures in the tests."
316 - elog "If you think it's django's fault report it to upstream."
317 - elog "Otherwise either disable the tests or use a stable version."
318 - PYTHONPATH="." ${python} tests/runtests.py --settings=settings -v1 || die "tests failed"
319 + # Tests have non-standard assumptions about PYTHONPATH and
320 + # don't work with usual "build-${PYTHON_ABI}/lib".
321 + PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1
322 + }
323 + python_execute_function testing
324 }
325
326 src_install() {
327 - distutils_python_version
328 - site_pkgs="$(python_get_sitedir)"
329 - export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}"
330 - dodir ${site_pkgs}
331 -
332 distutils_src_install
333
334 - dobin django/bin/{compile-messages,daily_cleanup,make-messages,unique-messages,profiling/gather_profile_stats}.py
335 - doman docs/man/*
336 -
337 dobashcompletion extras/django_bash_completion
338
339 - if use examples ; then
340 + if use examples; then
341 insinto /usr/share/doc/${PF}
342 doins -r examples
343 fi
344
345 - if use doc ; then
346 + if use doc; then
347 + rm -fr docs/_build/html/_sources
348 dohtml -A txt -r docs/_build/html/*
349 fi
350 +
351 + insinto "${MY_HTDOCSDIR#${EPREFIX}}"
352 + doins -r django/contrib/admin/media/* || die "doins failed"
353 +
354 + webapp_src_install
355 +}
356 +
357 +pkg_preinst() {
358 + :
359 +}
360 +
361 +pkg_postinst() {
362 + bash-completion_pkg_postinst
363 + distutils_pkg_postinst
364 +
365 + einfo "Now, Django has the best of both worlds with Gentoo,"
366 + einfo "ease of deployment for production and development."
367 + echo
368 + elog "A copy of the admin media is available to"
369 + elog "webapp-config for installation in a webroot,"
370 + elog "as well as the traditional location in python's"
371 + elog "site-packages dir for easy development"
372 + echo
373 + ewarn "If you build Django ${PV} without USE=\"vhosts\""
374 + ewarn "webapp-config will automatically install the"
375 + ewarn "admin media into the localhost webroot."
376 }