diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2013-04-03 13:52:49 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2013-04-03 13:52:49 +0000 |
| commit | 8d9edbe887cd3b0cb8675d2b16c9bbe8791aed78 (patch) | |
| tree | b1120055d8c841c3c92d3d29547e4c2047521e7d /dev-python/django | |
| parent | Version bump. (diff) | |
| download | gentoo-2-8d9edbe887cd3b0cb8675d2b16c9bbe8791aed78.tar.gz gentoo-2-8d9edbe887cd3b0cb8675d2b16c9bbe8791aed78.tar.bz2 gentoo-2-8d9edbe887cd3b0cb8675d2b16c9bbe8791aed78.zip | |
Fix src_install function, bug 464270 by Tom Samstag.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/django')
| -rw-r--r-- | dev-python/django/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-python/django/django-1.5-r1.ebuild (renamed from dev-python/django/django-1.5.ebuild) | 9 | ||||
| -rw-r--r-- | dev-python/django/django-9999.ebuild | 9 |
3 files changed, 19 insertions, 7 deletions
diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog index 765438ced6a6..6fdd06196c3d 100644 --- a/dev-python/django/ChangeLog +++ b/dev-python/django/ChangeLog @@ -1,6 +1,12 @@ # 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.104 2013/03/30 13:21:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.105 2013/04/03 13:52:49 floppym Exp $ + +*django-1.5-r1 (03 Apr 2013) + + 03 Apr 2013; Mike Gilbert <floppym@gentoo.org> +django-1.5-r1.ebuild, + -django-1.5.ebuild, django-9999.ebuild: + Fix src_install function, bug 464270 by Tom Samstag. 30 Mar 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.ebuild, django-9999.ebuild: diff --git a/dev-python/django/django-1.5.ebuild b/dev-python/django/django-1.5-r1.ebuild index 5bd014842ac9..ae3693c8bc14 100644 --- a/dev-python/django/django-1.5.ebuild +++ b/dev-python/django/django-1.5-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.5.ebuild,v 1.5 2013/03/30 13:21:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5-r1.ebuild,v 1.1 2013/04/03 13:52:49 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) @@ -49,6 +49,11 @@ src_test() { DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test } +src_install() { + distutils-r1_src_install + webapp_src_install +} + python_install_all() { distutils-r1_python_install_all newbashcomp extras/django_bash_completion ${PN} @@ -60,8 +65,6 @@ python_install_all() { insinto "${MY_HTDOCSDIR#${EPREFIX}}" doins -r django/contrib/admin/static/admin/. - - webapp_src_install } pkg_postinst() { diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild index 4eeaa2cbeb4c..5312c7fc1e22 100644 --- a/dev-python/django/django-9999.ebuild +++ b/dev-python/django/django-9999.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-9999.ebuild,v 1.19 2013/03/30 13:21:39 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.20 2013/04/03 13:52:49 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) @@ -60,6 +60,11 @@ src_test() { DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test } +src_install() { + distutils-r1_src_install + webapp_src_install +} + python_install_all() { distutils-r1_python_install_all newbashcomp extras/django_bash_completion ${PN} @@ -71,8 +76,6 @@ python_install_all() { insinto "${MY_HTDOCSDIR#${EPREFIX}}" doins -r django/contrib/admin/static/admin/. - - webapp_src_install } pkg_postinst() { |