summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2013-01-19 18:07:34 +0000
committerMichał Górny <mgorny@gentoo.org>2013-01-19 18:07:34 +0000
commitdfac42cda7b9f978b2cac533eb4bd408fe074172 (patch)
treefdc5aed4d347a37eedd54d7e619a040a09715798 /dev-python/django
parentFix Manifest entry for ChangeLog. (diff)
downloadgentoo-2-dfac42cda7b9f978b2cac533eb4bd408fe074172.tar.gz
gentoo-2-dfac42cda7b9f978b2cac533eb4bd408fe074172.tar.bz2
gentoo-2-dfac42cda7b9f978b2cac533eb4bd408fe074172.zip
Fix phase override done by webapp.eclass.
(Portage version: 2.2.0_alpha155/cvs/Linux x86_64, signed Manifest commit with key 42B9401D)
Diffstat (limited to 'dev-python/django')
-rw-r--r--dev-python/django/ChangeLog5
-rw-r--r--dev-python/django/django-1.4.2-r1.ebuild11
2 files changed, 12 insertions, 4 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 1b6b37d78ded..531876fc4c68 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/django
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.92 2013/01/17 22:56:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.93 2013/01/19 18:07:34 mgorny Exp $
+
+ 19 Jan 2013; Michał Górny <mgorny@gentoo.org> django-1.4.2-r1.ebuild:
+ Fix phase override done by webapp.eclass.
*django-1.4.2-r1 (17 Jan 2013)
diff --git a/dev-python/django/django-1.4.2-r1.ebuild b/dev-python/django/django-1.4.2-r1.ebuild
index b369ec63f22c..88e380a489de 100644
--- a/dev-python/django/django-1.4.2-r1.ebuild
+++ b/dev-python/django/django-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.2-r1.ebuild,v 1.1 2013/01/17 22:56:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.2-r1.ebuild,v 1.2 2013/01/19 18:07:34 mgorny Exp $
EAPI=5
@@ -58,6 +58,11 @@ python_test() {
|| die "Tests fail with ${EPYTHON}"
}
+src_install() {
+ distutils-r1_src_install
+ webapp_src_install
+}
+
python_install_all() {
distutils-r1_python_install_all
@@ -70,8 +75,6 @@ python_install_all() {
insinto "${MY_HTDOCSDIR#${EPREFIX}}"
doins -r django/contrib/admin/static/admin/.
-
- webapp_src_install
}
pkg_postinst() {
@@ -81,6 +84,8 @@ pkg_postinst() {
elog "site-packages dir for easy development"
elog
ewarn "If you build Django ${PV} without USE=\"vhosts\""
+
+ # XXX: call webapp_pkg_postinst? the old ebuild didn't do that...
ewarn "webapp-config will automatically install the"
ewarn "admin media into the localhost webroot."
}