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.4.ebuild ChangeLog
Date: Sun, 01 Apr 2012 17:20:08
Message-Id: 20120401171953.CDB642004B@flycatcher.gentoo.org
1 floppym 12/04/01 17:19:53
2
3 Modified: django-1.4.ebuild ChangeLog
4 Log:
5 Fix dependencies. Install django/contrib/admin/static/admin/*. Ported from Progress Overlay. Patch by Arfrever.
6
7 (Portage version: 2.2.0_alpha96/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 dev-python/django/django-1.4.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/django-1.4.ebuild?r1=1.1&r2=1.2
15
16 Index: django-1.4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- django-1.4.ebuild 1 Apr 2012 05:29:36 -0000 1.1
23 +++ django-1.4.ebuild 1 Apr 2012 17:19:53 -0000 1.2
24 @@ -1,20 +1,19 @@
25 # Copyright 1999-2012 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.4.ebuild,v 1.1 2012/04/01 05:29:36 patrick Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.ebuild,v 1.2 2012/04/01 17:19:53 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 eutils versionator webapp
36 +inherit bash-completion-r1 distutils versionator webapp
37
38 MY_P="Django-${PV}"
39
40 DESCRIPTION="High-level Python web framework"
41 HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
42 -#SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
43 -SRC_URI="http://www.djangoproject.com/download/1.4/tarball/ -> ${MY_P}.tar.gz"
44 +SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
45
46 LICENSE="BSD"
47 SLOT="0"
48 @@ -23,7 +22,7 @@
49
50 RDEPEND="dev-python/imaging
51 sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
52 - postgres? ( dev-python/psycopg )
53 + postgres? ( dev-python/psycopg:2 )
54 mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
55 DEPEND="${RDEPEND}
56 doc? ( >=dev-python/sphinx-0.3 )
57 @@ -41,7 +40,6 @@
58
59 src_prepare() {
60 distutils_src_prepare
61 - #epatch "${FILESDIR}/${P}-djangodocs_extension.patch"
62
63 # Disable tests requiring network connection.
64 sed \
65 @@ -86,8 +84,7 @@
66 fi
67
68 insinto "${MY_HTDOCSDIR#${EPREFIX}}"
69 - # gone
70 - #doins -r django/contrib/admin/media/* || die "doins failed"
71 + doins -r django/contrib/admin/static/admin/* || die "doins failed"
72
73 webapp_src_install
74 }
75
76
77
78 1.79 dev-python/django/ChangeLog
79
80 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.79&view=markup
81 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?rev=1.79&content-type=text/plain
82 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/django/ChangeLog?r1=1.78&r2=1.79
83
84 Index: ChangeLog
85 ===================================================================
86 RCS file: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v
87 retrieving revision 1.78
88 retrieving revision 1.79
89 diff -u -r1.78 -r1.79
90 --- ChangeLog 1 Apr 2012 05:29:36 -0000 1.78
91 +++ ChangeLog 1 Apr 2012 17:19:53 -0000 1.79
92 @@ -1,6 +1,10 @@
93 # ChangeLog for dev-python/django
94 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
95 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.78 2012/04/01 05:29:36 patrick Exp $
96 +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.79 2012/04/01 17:19:53 floppym Exp $
97 +
98 + 01 Apr 2012; Mike Gilbert <floppym@g.o> django-1.4.ebuild:
99 + Fix dependencies. Install django/contrib/admin/static/admin/*. Ported from
100 + Progress Overlay. Patch by Arfrever.
101
102 *django-1.4 (01 Apr 2012)