Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mike Gilbert (floppym)" <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-python/django: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
Date: Wed, 21 Dec 2011 07:06:58
Message-Id: 20111221070646.D753E2004C@flycatcher.gentoo.org
1 floppym 11/12/21 07:06:46
2
3 Modified: django-1.3.1-r1.ebuild django-9999.ebuild ChangeLog
4 Log:
5 Incorporate patch from Progress overlay by Arfrever. Should resolve bug 394777.
6
7 (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 dev-python/django/django-1.3.1-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild?r1=1.2&r2=1.3
15
16 Index: django-1.3.1-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- django-1.3.1-r1.ebuild 14 Dec 2011 23:44:08 -0000 1.2
23 +++ django-1.3.1-r1.ebuild 21 Dec 2011 07:06:46 -0000 1.3
24 @@ -1,13 +1,13 @@
25 # Copyright 1999-2011 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.3.1-r1.ebuild,v 1.2 2011/12/14 23:44:08 floppym Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1-r1.ebuild,v 1.3 2011/12/21 07:06:46 floppym Exp $
29
30 EAPI="3"
31 PYTHON_DEPEND="2"
32 SUPPORT_PYTHON_ABIS="1"
33 RESTRICT_PYTHON_ABIS="3.*"
34
35 -inherit bash-completion-r1 distutils versionator webapp
36 +inherit bash-completion-r1 distutils eutils versionator webapp
37
38 MY_P="Django-${PV}"
39
40 @@ -38,6 +38,22 @@
41 webapp_pkg_setup
42 }
43
44 +src_prepare() {
45 + distutils_src_prepare
46 + epatch "${FILESDIR}/${P}-djangodocs_extension.patch"
47 +
48 + # Disable tests requiring network connection.
49 + sed \
50 + -e "s/test_correct_url_value_passes/_&/" \
51 + -e "s/test_correct_url_with_redirect/_&/" \
52 + -i tests/modeltests/validation/tests.py
53 + sed \
54 + -e "s/test_urlfield_3/_&/" \
55 + -e "s/test_urlfield_4/_&/" \
56 + -e "s/test_urlfield_10/_&/" \
57 + -i tests/regressiontests/forms/tests/fields.py
58 +}
59 +
60 src_compile() {
61 distutils_src_compile
62
63
64
65
66 1.13 dev-python/django/django-9999.ebuild
67
68 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.13&view=markup
69 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.13&content-type=text/plain
70 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.12&r2=1.13
71
72 Index: django-9999.ebuild
73 ===================================================================
74 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v
75 retrieving revision 1.12
76 retrieving revision 1.13
77 diff -u -r1.12 -r1.13
78 --- django-9999.ebuild 14 Dec 2011 23:44:08 -0000 1.12
79 +++ django-9999.ebuild 21 Dec 2011 07:06:46 -0000 1.13
80 @@ -1,6 +1,6 @@
81 # Copyright 1999-2011 Gentoo Foundation
82 # Distributed under the terms of the GNU General Public License v2
83 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.12 2011/12/14 23:44:08 floppym Exp $
84 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.13 2011/12/21 07:06:46 floppym Exp $
85
86 EAPI="3"
87 PYTHON_DEPEND="2"
88 @@ -38,6 +38,21 @@
89 webapp_pkg_setup
90 }
91
92 +src_prepare() {
93 + distutils_src_prepare
94 +
95 + # Disable tests requiring network connection.
96 + sed \
97 + -e "s/test_correct_url_value_passes/_&/" \
98 + -e "s/test_correct_url_with_redirect/_&/" \
99 + -i tests/modeltests/validation/tests.py
100 + sed \
101 + -e "s/test_urlfield_3/_&/" \
102 + -e "s/test_urlfield_4/_&/" \
103 + -e "s/test_urlfield_10/_&/" \
104 + -i tests/regressiontests/forms/tests/fields.py
105 +}
106 +
107 src_compile() {
108 distutils_src_compile
109
110
111
112
113 1.77 dev-python/django/ChangeLog
114
115 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.77&view=markup
116 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.77&content-type=text/plain
117 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.76&r2=1.77
118
119 Index: ChangeLog
120 ===================================================================
121 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
122 retrieving revision 1.76
123 retrieving revision 1.77
124 diff -u -r1.76 -r1.77
125 --- ChangeLog 14 Dec 2011 23:44:08 -0000 1.76
126 +++ ChangeLog 21 Dec 2011 07:06:46 -0000 1.77
127 @@ -1,6 +1,12 @@
128 # ChangeLog for dev-python/django
129 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
130 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.76 2011/12/14 23:44:08 floppym Exp $
131 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.77 2011/12/21 07:06:46 floppym Exp $
132 +
133 + 21 Dec 2011; Mike Gilbert <floppym@g.o>
134 + +files/django-1.3.1-djangodocs_extension.patch, django-1.3.1-r1.ebuild,
135 + django-9999.ebuild:
136 + Incorporate patch from Progress overlay by Arfrever. Should resolve bug
137 + 394777.
138
139 14 Dec 2011; Mike Gilbert <floppym@g.o> django-1.3.1-r1.ebuild,
140 django-9999.ebuild:
Report Message
Find on MARC Find on Google Groups