1 |
arfrever 10/01/03 01:25:40 |
2 |
|
3 |
Modified: ChangeLog django-1.1.1.ebuild |
4 |
Log: |
5 |
Fix tests (bug #294575). |
6 |
(Portage version: 15156-svn/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.40 dev-python/django/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.40&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.40&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.39&r2=1.40 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v |
18 |
retrieving revision 1.39 |
19 |
retrieving revision 1.40 |
20 |
diff -u -r1.39 -r1.40 |
21 |
--- ChangeLog 10 Oct 2009 15:29:36 -0000 1.39 |
22 |
+++ ChangeLog 3 Jan 2010 01:25:39 -0000 1.40 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for dev-python/django |
25 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.39 2009/10/10 15:29:36 grobian Exp $ |
27 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.40 2010/01/03 01:25:39 arfrever Exp $ |
29 |
+ |
30 |
+ 03 Jan 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
31 |
+ django-1.1.1.ebuild, +files/django-1.1.1-fix_tests.patch: |
32 |
+ Fix tests (bug #294575). |
33 |
|
34 |
10 Oct 2009; Fabian Groffen <grobian@g.o> django-1.1.1.ebuild: |
35 |
Merge from Prefix |
36 |
|
37 |
|
38 |
|
39 |
1.3 dev-python/django/django-1.1.1.ebuild |
40 |
|
41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.3&view=markup |
42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?rev=1.3&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.1.1.ebuild?r1=1.2&r2=1.3 |
44 |
|
45 |
Index: django-1.1.1.ebuild |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v |
48 |
retrieving revision 1.2 |
49 |
retrieving revision 1.3 |
50 |
diff -u -r1.2 -r1.3 |
51 |
--- django-1.1.1.ebuild 10 Oct 2009 15:29:36 -0000 1.2 |
52 |
+++ django-1.1.1.ebuild 3 Jan 2010 01:25:39 -0000 1.3 |
53 |
@@ -1,17 +1,18 @@ |
54 |
-# Copyright 1999-2009 Gentoo Foundation |
55 |
+# Copyright 1999-2010 Gentoo Foundation |
56 |
# Distributed under the terms of the GNU General Public License v2 |
57 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.2 2009/10/10 15:29:36 grobian Exp $ |
58 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.3 2010/01/03 01:25:39 arfrever Exp $ |
59 |
|
60 |
EAPI="2" |
61 |
SUPPORT_PYTHON_ABIS="1" |
62 |
|
63 |
inherit bash-completion distutils multilib versionator webapp |
64 |
|
65 |
-MY_P="${P/#d/D}" |
66 |
+MY_PN="Django" |
67 |
+MY_P="${MY_PN}-${PV}" |
68 |
WEBAPP_MANUAL_SLOT="yes" |
69 |
|
70 |
DESCRIPTION="High-level python web framework" |
71 |
-HOMEPAGE="http://www.djangoproject.com/" |
72 |
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django" |
73 |
SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz" |
74 |
|
75 |
LICENSE="BSD" |
76 |
@@ -32,8 +33,7 @@ |
77 |
>=dev-lang/python-2.5[sqlite] |
78 |
( dev-python/pysqlite:2 <dev-lang/python-2.5 ) |
79 |
) )" |
80 |
- |
81 |
-RESTRICT_PYTHON_ABIS="3*" |
82 |
+RESTRICT_PYTHON_ABIS="3.*" |
83 |
|
84 |
S="${WORKDIR}/${MY_P}" |
85 |
|
86 |
@@ -41,10 +41,15 @@ |
87 |
|
88 |
DOCS="docs/* AUTHORS" |
89 |
|
90 |
+src_prepare() { |
91 |
+ distutils_src_prepare |
92 |
+ epatch "${FILESDIR}/${P}-fix_tests.patch" |
93 |
+} |
94 |
+ |
95 |
src_compile() { |
96 |
distutils_src_compile |
97 |
|
98 |
- if use doc ; then |
99 |
+ if use doc; then |
100 |
pushd docs > /dev/null |
101 |
emake html || die "Generation of HTML documentation failed" |
102 |
popd > /dev/null |
103 |
@@ -59,36 +64,38 @@ |
104 |
ROOT_URLCONF='tests/urls.py' |
105 |
SITE_ID=1 |
106 |
__EOF__ |
107 |
- PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" tests/runtests.py --settings=settings -v1 |
108 |
+ # Tests have non-standard assumptions about PYTHONPATH and |
109 |
+ # don't work with usual "build-${PYTHON_ABI}/lib". |
110 |
+ PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=settings -v1 |
111 |
} |
112 |
python_execute_function testing |
113 |
} |
114 |
|
115 |
src_install() { |
116 |
- [[ -z ${ED} ]] && local ED=${D} |
117 |
- distutils_python_version |
118 |
- site_pkgs="$(python_get_sitedir)" |
119 |
- export PYTHONPATH="${PYTHONPATH}:${ED}/${site_pkgs}" |
120 |
- dodir ${site_pkgs} |
121 |
+ [[ -z "${ED}" ]] && local ED="${D}" |
122 |
+ |
123 |
+ python_set_active_version 2 |
124 |
+ local sitedir="$(python_get_sitedir)" |
125 |
+ export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}${ED}/${sitedir}" |
126 |
+ dodir "${sitedir}" |
127 |
|
128 |
distutils_src_install |
129 |
|
130 |
dobashcompletion extras/django_bash_completion |
131 |
|
132 |
- if use examples ; then |
133 |
+ if use examples; then |
134 |
insinto /usr/share/doc/${PF} |
135 |
doins -r examples |
136 |
fi |
137 |
|
138 |
- if use doc ; then |
139 |
+ if use doc; then |
140 |
mv docs/_build/html/{_,.}sources |
141 |
dohtml txt -r docs/_build/html/* |
142 |
fi |
143 |
|
144 |
insinto "${MY_HTDOCSDIR#${EPREFIX}}" |
145 |
- doins -r "${ED}/${site_pkgs}"/django/contrib/admin/media/* |
146 |
+ doins -r "${ED}/${sitedir}/django/contrib/admin/media/"* || die "doins failed" |
147 |
|
148 |
- #webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt |
149 |
webapp_src_install |
150 |
} |