From 5e3a731fa7a913fdd7cb3c5de68e79aa1d62595f Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Sun, 14 Feb 2010 17:37:11 +0000 Subject: Fix installation (bug #304789). (Portage version: 15354-svn/cvs/Linux x86_64) --- dev-python/django/ChangeLog | 6 +++++- dev-python/django/django-1.1.1.ebuild | 10 +++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index e601bbc2ff36..dacf6957c04a 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/django # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.43 2010/02/08 08:43:13 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.44 2010/02/14 17:37:11 arfrever Exp $ + + 14 Feb 2010; Arfrever Frehtes Taifersar Arahesis + django-1.1.1.ebuild: + Fix installation (bug #304789). 08 Feb 2010; Peter Volkov django-1.1.1.ebuild: Add inherit eutils for epatch. diff --git a/dev-python/django/django-1.1.1.ebuild b/dev-python/django/django-1.1.1.ebuild index 4ff4173d5fca..473bfbc84c6c 100644 --- a/dev-python/django/django-1.1.1.ebuild +++ b/dev-python/django/django-1.1.1.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2010 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.6 2010/02/08 08:43:13 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.1.1.ebuild,v 1.7 2010/02/14 17:37:11 arfrever Exp $ EAPI="2" +PYTHON_DEPEND="2" SUPPORT_PYTHON_ABIS="1" inherit eutils bash-completion distutils multilib versionator webapp @@ -74,11 +75,6 @@ __EOF__ src_install() { [[ -z "${ED}" ]] && local ED="${D}" - python_set_active_version 2 - local sitedir="$(python_get_sitedir)" - export PYTHONPATH="${PYTHONPATH}${PYTHONPATH:+:}${ED}/${sitedir}" - dodir "${sitedir}" - distutils_src_install dobashcompletion extras/django_bash_completion @@ -94,7 +90,7 @@ src_install() { fi insinto "${MY_HTDOCSDIR#${EPREFIX}}" - doins -r "${ED}/${sitedir}/django/contrib/admin/media/"* || die "doins failed" + doins -r django/contrib/admin/media/* || die "doins failed" webapp_src_install } -- cgit v1.2.3-65-gdbad