Version bumps for security bug 447470. Port 1.3.7 to distutils-r1. Disable parallel testing.

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

4 files changed, 212 insertions, 2 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index ccb5384dcc58..c679f1ecd244 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,14 @@
 # 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.95 2013/02/17 18:03:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.96 2013/02/23 21:26:05 floppym Exp $
+
+*django-1.3.7 (23 Feb 2013)
+*django-1.4.5 (23 Feb 2013)
+
+  23 Feb 2013; Mike Gilbert <floppym@gentoo.org> +django-1.3.7.ebuild,
+  +django-1.4.5.ebuild, django-9999.ebuild:
+  Version bumps for security bug 447470. Port 1.3.7 to distutils-r1. Disable
+  parallel testing.
 
   17 Feb 2013; Mike Gilbert <floppym@gentoo.org> django-9999.ebuild:
   Convert to git, bug 457976 by guileone.
diff --git a/dev-python/django/django-1.3.7.ebuild b/dev-python/django/django-1.3.7.ebuild
new file mode 100644
index 000000000000..982d62b13bb7
--- /dev/null
+++ b/dev-python/django/django-1.3.7.ebuild
@@ -0,0 +1,99 @@
+# 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.3.7.ebuild,v 1.1 2013/02/23 21:26:05 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE='sqlite?'
+
+inherit bash-completion-r1 distutils-r1 versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+RDEPEND="dev-python/imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}/${PN}-1.3.1-djangodocs_extension.patch" )
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_correct_url_value_passes/_&/" \
+		-e "s/test_correct_url_with_redirect/_&/" \
+		-i tests/modeltests/validation/tests.py || die
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. \
+	"${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	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}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		dohtml -A txt -r docs/_build/html/.
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/media/.
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to"
+	elog "webapp-config for installation in a webroot,"
+	elog "as well as the traditional location in python's"
+	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."
+}
diff --git a/dev-python/django/django-1.4.5.ebuild b/dev-python/django/django-1.4.5.ebuild
new file mode 100644
index 000000000000..e364319a951d
--- /dev/null
+++ b/dev-python/django/django-1.4.5.ebuild
@@ -0,0 +1,97 @@
+# 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.5.ebuild,v 1.1 2013/02/23 21:26:05 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE='sqlite?'
+
+inherit bash-completion-r1 distutils-r1 versionator webapp
+
+MY_P="Django-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="http://www.djangoproject.com/ http://pypi.python.org/pypi/Django"
+SRC_URI="https://www.djangoproject.com/m/releases/$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+RDEPEND="dev-python/imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_correct_url_value_passes/_&/" \
+		-e "s/test_correct_url_with_redirect/_&/" \
+		-i tests/modeltests/validation/tests.py || die
+	sed \
+		-e "s/test_urlfield_3/_&/" \
+		-e "s/test_urlfield_4/_&/" \
+		-e "s/test_urlfield_10/_&/" \
+		-i tests/regressiontests/forms/tests/fields.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. \
+	"${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	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}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		dohtml -A txt -r docs/_build/html/.
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to"
+	elog "webapp-config for installation in a webroot,"
+	elog "as well as the traditional location in python's"
+	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."
+}
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index 03dd095fed09..365bd72a2f84 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.17 2013/02/17 18:03:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.18 2013/02/23 21:26:05 floppym Exp $
 
 EAPI=5
 
@@ -69,6 +69,12 @@ python_test() {
 		|| die "Tests fail with ${EPYTHON}"
 }
 
+src_test() {
+	# Port conflict in django.test.testcases.LiveServerTestCase.
+	# Several other races with temp files.
+	DISTUTILS_NO_PARALLEL_BUILD=1 distutils-r1_src_test
+}
+
 python_install_all() {
 	distutils-r1_python_install_all