diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2009-10-10 15:29:36 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2009-10-10 15:29:36 +0000 |
| commit | 33bdecf0fa60a60a868b3ed9ca9ef62acb25a429 (patch) | |
| tree | adf844a7da18d71da11587d5baa657b392dd0c54 /dev-python/django | |
| parent | sparc stable wrt #256975 (diff) | |
| download | gentoo-2-33bdecf0fa60a60a868b3ed9ca9ef62acb25a429.tar.gz gentoo-2-33bdecf0fa60a60a868b3ed9ca9ef62acb25a429.tar.bz2 gentoo-2-33bdecf0fa60a60a868b3ed9ca9ef62acb25a429.zip | |
Merge from Prefix
(Portage version: 2.2.00.14552-prefix/cvs/Darwin powerpc, RepoMan options: --force)
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/django/django-1.1.1.ebuild | 11 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index d862bc6d203c..bc9817c30827 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/django # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.38 2009/10/09 23:08:40 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.39 2009/10/10 15:29:36 grobian Exp $ + + 10 Oct 2009; Fabian Groffen <grobian@gentoo.org> django-1.1.1.ebuild: + Merge from Prefix 09 Oct 2009; Patrick Lauer <patrick@gentoo.org> -django-1.0.2-r1.ebuild, -django-1.0.3.ebuild, -django-1.1.ebuild: diff --git a/dev-python/django/django-1.1.1.ebuild b/dev-python/django/django-1.1.1.ebuild index 2eba0c5e517b..78205290e5e8 100644 --- a/dev-python/django/django-1.1.1.ebuild +++ b/dev-python/django/django-1.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.1 2009/10/09 23:05:00 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.2 2009/10/10 15:29:36 grobian Exp $ EAPI="2" SUPPORT_PYTHON_ABIS="1" @@ -16,7 +16,7 @@ SRC_URI="http://media.djangoproject.com/releases/${PV}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="doc examples mysql postgres sqlite test" RDEPEND="dev-python/imaging @@ -65,9 +65,10 @@ __EOF__ } src_install() { + [[ -z ${ED} ]] && local ED=${D} distutils_python_version site_pkgs="$(python_get_sitedir)" - export PYTHONPATH="${PYTHONPATH}:${D}/${site_pkgs}" + export PYTHONPATH="${PYTHONPATH}:${ED}/${site_pkgs}" dodir ${site_pkgs} distutils_src_install @@ -84,8 +85,8 @@ src_install() { dohtml txt -r docs/_build/html/* fi - insinto "${MY_HTDOCSDIR}" - doins -r "${D}/${site_pkgs}"/django/contrib/admin/media/* + insinto "${MY_HTDOCSDIR#${EPREFIX}}" + doins -r "${ED}/${site_pkgs}"/django/contrib/admin/media/* #webapp_postinst_txt en "${WORKDIR}"/postinstall-en.txt webapp_src_install |