1 |
pythonhead 08/10/06 18:42:46 |
2 |
|
3 |
Modified: django-9999.ebuild ChangeLog django-1.0.ebuild |
4 |
Log: |
5 |
Fixed tests, added sphinx doc generation, dropped ppc64 until sphinx is keyworded, use EAPI1 for slots |
6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 dev-python/django/django-9999.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-9999.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-9999.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: django-9999.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- django-9999.ebuild 7 Jun 2008 12:51:16 -0000 1.1 |
22 |
+++ django-9999.ebuild 6 Oct 2008 18:42:46 -0000 1.2 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.1 2008/06/07 12:51:16 dev-zero Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.2 2008/10/06 18:42:46 pythonhead Exp $ |
28 |
|
29 |
ESVN_REPO_URI="http://code.djangoproject.com/svn/django/trunk/" |
30 |
|
31 |
@@ -10,7 +10,7 @@ |
32 |
HOMEPAGE="http://www.djangoproject.com/" |
33 |
LICENSE="BSD" |
34 |
SLOT="0" |
35 |
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" |
36 |
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86" |
37 |
IUSE="doc examples mysql postgres sqlite test" |
38 |
|
39 |
RDEPEND="dev-python/imaging |
40 |
|
41 |
|
42 |
|
43 |
1.26 dev-python/django/ChangeLog |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.26&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?rev=1.26&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/ChangeLog?r1=1.25&r2=1.26 |
48 |
|
49 |
Index: ChangeLog |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v |
52 |
retrieving revision 1.25 |
53 |
retrieving revision 1.26 |
54 |
diff -u -r1.25 -r1.26 |
55 |
--- ChangeLog 4 Sep 2008 06:21:44 -0000 1.25 |
56 |
+++ ChangeLog 6 Oct 2008 18:42:46 -0000 1.26 |
57 |
@@ -1,6 +1,11 @@ |
58 |
# ChangeLog for dev-python/django |
59 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
60 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.25 2008/09/04 06:21:44 pythonhead Exp $ |
61 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.26 2008/10/06 18:42:46 pythonhead Exp $ |
62 |
+ |
63 |
+ 06 Oct 2008; Rob Cakebread <pythonhead@g.o> django-1.0.ebuild, |
64 |
+ django-9999.ebuild: |
65 |
+ Fixed tests, added sphinx doc generation, dropped ppc64 until sphinx is |
66 |
+ keyworded, use EAPI1 for slots |
67 |
|
68 |
*django-1.0 (04 Sep 2008) |
69 |
|
70 |
|
71 |
|
72 |
|
73 |
1.3 dev-python/django/django-1.0.ebuild |
74 |
|
75 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.0.ebuild?rev=1.3&view=markup |
76 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.0.ebuild?rev=1.3&content-type=text/plain |
77 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/django/django-1.0.ebuild?r1=1.2&r2=1.3 |
78 |
|
79 |
Index: django-1.0.ebuild |
80 |
=================================================================== |
81 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.ebuild,v |
82 |
retrieving revision 1.2 |
83 |
retrieving revision 1.3 |
84 |
diff -u -r1.2 -r1.3 |
85 |
--- django-1.0.ebuild 4 Sep 2008 14:52:23 -0000 1.2 |
86 |
+++ django-1.0.ebuild 6 Oct 2008 18:42:46 -0000 1.3 |
87 |
@@ -1,35 +1,52 @@ |
88 |
# Copyright 1999-2008 Gentoo Foundation |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.ebuild,v 1.2 2008/09/04 14:52:23 mr_bones_ Exp $ |
91 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.0.ebuild,v 1.3 2008/10/06 18:42:46 pythonhead Exp $ |
92 |
|
93 |
-inherit bash-completion distutils eutils versionator |
94 |
+EAPI="1" |
95 |
+inherit bash-completion distutils versionator |
96 |
|
97 |
DESCRIPTION="high-level python web framework" |
98 |
HOMEPAGE="http://www.djangoproject.com/" |
99 |
SRC_URI="http://media.djangoproject.com/releases/${PV}/Django-${PV}.tar.gz" |
100 |
LICENSE="BSD" |
101 |
SLOT="0" |
102 |
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" |
103 |
-IUSE="examples mysql postgres sqlite3 test" |
104 |
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86" |
105 |
+IUSE="doc examples mysql postgres sqlite3 test" |
106 |
|
107 |
RDEPEND="dev-python/imaging |
108 |
sqlite3? ( || ( |
109 |
- ( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 ) |
110 |
+ ( dev-python/pysqlite:2 <dev-lang/python-2.5 ) |
111 |
>=dev-lang/python-2.5 ) ) |
112 |
test? ( || ( |
113 |
- ( >=dev-python/pysqlite-2.0.3 <dev-lang/python-2.5 ) |
114 |
+ ( dev-python/pysqlite:2 <dev-lang/python-2.5 ) |
115 |
>=dev-lang/python-2.5 ) ) |
116 |
postgres? ( dev-python/psycopg ) |
117 |
- mysql? ( >=dev-python/mysql-python-1.2.1_p2 )" |
118 |
+ mysql? ( >=dev-python/mysql-python-1.2.1_p2 ) |
119 |
+ doc? ( >=dev-python/sphinx-0.3 )" |
120 |
DEPEND="${RDEPEND}" |
121 |
|
122 |
S="${WORKDIR}/${P/#d/D}" |
123 |
|
124 |
DOCS="docs/* AUTHORS" |
125 |
|
126 |
+ |
127 |
+src_unpack() { |
128 |
+ unpack ${A} |
129 |
+ cd "${S}" |
130 |
+ #Submitted upstream http://code.djangoproject.com/ticket/8865 |
131 |
+ #by pythonhead, accepted in trunk |
132 |
+ epatch "${FILESDIR}/${P}"-fields.py.patch |
133 |
+} |
134 |
+ |
135 |
+src_compile() { |
136 |
+ distutils_src_compile |
137 |
+ if use doc ; then |
138 |
+ cd docs |
139 |
+ emake html || die "docs failed" |
140 |
+ fi |
141 |
+} |
142 |
+ |
143 |
src_test() { |
144 |
- #Test fails, reported upstream http://code.djangoproject.com/ticket/8865 |
145 |
- echo "tests='''pass'''" > tests/regressiontests/forms/fields.py |
146 |
cat >> tests/settings.py << __EOF__ |
147 |
DATABASE_ENGINE='sqlite3' |
148 |
ROOT_URLCONF='tests/urls.py' |
149 |
@@ -39,11 +56,9 @@ |
150 |
} |
151 |
|
152 |
src_install() { |
153 |
- #TODO: Use sphinx to generate docs when sphinx is keyworded for |
154 |
- #all arches django is |
155 |
distutils_python_version |
156 |
|
157 |
- site_pkgs="/usr/$(get_libdir)/python${PYVER}/site-packages/" |
158 |
+ site_pkgs="$(python_get_sitedir)" |
159 |
export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}" |
160 |
dodir ${site_pkgs} |
161 |
|
162 |
@@ -55,4 +70,8 @@ |
163 |
insinto /usr/share/doc/${PF} |
164 |
doins -r examples |
165 |
fi |
166 |
+ if use doc ; then |
167 |
+ rm -Rf docs/_build/html/_sources |
168 |
+ dohtml txt -r docs/_build/html/* |
169 |
+ fi |
170 |
} |