[patch] django-1.1.1-there-can-be-only-one-python.patch

django-1.1.1-there-can-be-only-one-python.patch (text/plain), 742 bytes, created by [e-mail] on 2010-02-12 22:57:12 UTC

--- dev-python/django/django-1.1.1.ebuild.orig	2010-02-08 04:06:30.000000000 -0500
+++ dev-python/django/django-1.1.1.ebuild	2010-02-12 17:48:51.000000000 -0500
@@ -74,11 +74,6 @@
 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 +89,8 @@
 	fi
 
 	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r "${ED}/${sitedir}/django/contrib/admin/media/"* || die "doins failed"
+	doins -r "${ED}/$(python_get_sitedir -f)/django/contrib/admin/media/"* ||
+		die "doins failed"
 
 	webapp_src_install
 }