diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-04-01 17:19:53 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-01 17:19:53 +0000 |
| commit | 3f08a10ff1bdb4c2c828143d3b199d36cdbe8800 (patch) | |
| tree | ffea6d0efa29968f41781b925c81feb8d46c13d4 /dev-python/django | |
| parent | alpha/ia64/sparc stable wrt #408245 (diff) | |
| download | historical-3f08a10ff1bdb4c2c828143d3b199d36cdbe8800.tar.gz historical-3f08a10ff1bdb4c2c828143d3b199d36cdbe8800.tar.bz2 historical-3f08a10ff1bdb4c2c828143d3b199d36cdbe8800.zip | |
Fix dependencies. Install django/contrib/admin/static/admin/*. Ported from Progress Overlay. Patch by Arfrever.
Package-Manager: portage-2.2.0_alpha96/cvs/Linux x86_64
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/django/django-1.4.ebuild | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index 0923c6fd60e5..f108a3f93983 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/django # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.78 2012/04/01 05:29:36 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.79 2012/04/01 17:19:53 floppym Exp $ + + 01 Apr 2012; Mike Gilbert <floppym@gentoo.org> django-1.4.ebuild: + Fix dependencies. Install django/contrib/admin/static/admin/*. Ported from + Progress Overlay. Patch by Arfrever. *django-1.4 (01 Apr 2012) diff --git a/dev-python/django/django-1.4.ebuild b/dev-python/django/django-1.4.ebuild index ea2523752e76..fff695af8227 100644 --- a/dev-python/django/django-1.4.ebuild +++ b/dev-python/django/django-1.4.ebuild @@ -1,20 +1,19 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.ebuild,v 1.1 2012/04/01 05:29:36 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.ebuild,v 1.2 2012/04/01 17:19:53 floppym Exp $ EAPI="3" PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" RESTRICT_PYTHON_ABIS="3.*" -inherit bash-completion-r1 distutils eutils versionator webapp +inherit bash-completion-r1 distutils versionator webapp MY_P="Django-${PV}" DESCRIPTION="High-level Python web framework" HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django" -#SRC_URI="http://media.djangoproject.com/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz" -SRC_URI="http://www.djangoproject.com/download/1.4/tarball/ -> ${MY_P}.tar.gz" +SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" @@ -23,7 +22,7 @@ IUSE="doc mysql postgres sqlite test" RDEPEND="dev-python/imaging sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) ) - postgres? ( dev-python/psycopg ) + postgres? ( dev-python/psycopg:2 ) mysql? ( >=dev-python/mysql-python-1.2.1_p2 )" DEPEND="${RDEPEND} doc? ( >=dev-python/sphinx-0.3 ) @@ -41,7 +40,6 @@ pkg_setup() { src_prepare() { distutils_src_prepare - #epatch "${FILESDIR}/${P}-djangodocs_extension.patch" # Disable tests requiring network connection. sed \ @@ -86,8 +84,7 @@ src_install() { fi insinto "${MY_HTDOCSDIR#${EPREFIX}}" - # gone - #doins -r django/contrib/admin/media/* || die "doins failed" + doins -r django/contrib/admin/static/admin/* || die "doins failed" webapp_src_install } |