Version bump django to 1.3.1.

Package-Manager: portage-2.1.10.14/cvs/Linux x86_64

3 files changed, 109 insertions, 6 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 64ccd2aeffad..5bc959f770bb 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.69 2011/05/01 16:42:10 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.70 2011/09/10 05:56:53 djc Exp $
+
+*django-1.3.1 (10 Sep 2011)
+
+  10 Sep 2011; Dirkjan Ochtman <djc@gentoo.org> +django-1.3.1.ebuild:
+  Version bump to 1.3.1.
 
   01 May 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> django-1.3.ebuild:
   x86 stable wrt bug #364415
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 1067603a76c9..008b1768cdc9 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 DIST Django-1.1.4.tar.gz 5750441 RMD160 2aac00043088fa705de428ca44240253fbd79af6 SHA1 a636ea12c5d8b5d5befec60bb356016f092b1943 SHA256 1f9d48a741f98951e65818e167c84c407d1c322efcfd4cb419384773ea793dee
 DIST Django-1.2.5.tar.gz 6379313 RMD160 e57f48331377047763875876e51c754f91f58f80 SHA1 9593e6745650d06c0af82a79d6e304d958419f94 SHA256 649387248296386b589c4a8bf91d34590b43f93b6ebfe6cefbea0ddf4641ccd6
+DIST Django-1.3.1.tar.gz 6514564 RMD160 baf14da8d25eb9852a7989e1a1be7d9fd0e21d3a SHA1 fd968134c8ded38d2d9ccd2cafe865a0585aefc4 SHA256 af9118c4e8a063deb0b8cda901fcff2b805e7cf496c93fd43507163f3cde156b
 DIST Django-1.3.tar.gz 6504003 RMD160 57a3bdb3eb326634647d2eea9df1b5484316c7bc SHA1 f8814d5e1412bb932318db5130260da5bf053ff7 SHA256 7aeee5c80002ab81d4ebf5416292949ff46e1448d183a183fe05ff6344771c83
 EBUILD django-1.1.4.ebuild 2549 RMD160 87107de3e32e0c74debe57f23260d08ddcc26f88 SHA1 570c02ff1b9681a665280ee1911f346d9e585be4 SHA256 32fd6fbcbcd34297527293081c135242bb4cd31e5fd5ff805268e2f9de3c0979
 EBUILD django-1.2.5.ebuild 2688 RMD160 8a3ff9c99ccfea617c383c432c089af58882b0b5 SHA1 5fe24b90d1314bf9faade5ab673a2847095ecb4d SHA256 9fd7bdd75cb620909d8407f163b0ac7cd8e8acd845ee0111253fea843017461a
+EBUILD django-1.3.1.ebuild 2685 RMD160 1abffa90839057ed7ddc62b13a6e6e2902dad8a1 SHA1 4e7d8e11a08ec3264c2c998514a26bf8ab23cd70 SHA256 944f07a137796cd422089de67a0c341a83abe136bbf8c0e3aceec0eaaef255a0
 EBUILD django-1.3.ebuild 2688 RMD160 5aa33bea4cd9c4b2f5897f597a0c190c18084426 SHA1 0012312329a017bf0c46d26f7c99d6d5c4f544a3 SHA256 7c844b0b71656520df4d30bb75eeffa93e9b4a9a7d9c81ef1623ec07827e98e4
 EBUILD django-9999.ebuild 2543 RMD160 540a51b64d471f433e9071ca0f4219b7353441e5 SHA1 fb671ec6fdbbe3527cba97b7f40d1998b2bc07c3 SHA256 ca1fe7ef74821fda031b12f289ce81daa2af930cf3abd16dba39fe21766f57b1
-MISC ChangeLog 10654 RMD160 5d67cb2f3769dff9614477b17f0c6b35faa30b8c SHA1 75badb43d03757673e4f90f1da073683862a7441 SHA256 8c27bdc27a3ff264642f16b29e57a185ab4bf49d63e0d1efeb925ea6456f3e89
+MISC ChangeLog 10772 RMD160 6d4d1d1e6103baa4011684e345d27647079bdab4 SHA1 c654cc48e138cdf0fc3b5079ef0aaa27fd934164 SHA256 ac95013526c47ae800fab0b8e78b542390175386865e1be76ee984f8e7a33e80
 MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk29jXIACgkQuUQtlDBCeQKoFgCdGv4TH0wNRwB2zA4s8z9Ngml4
-bpoAmwTsMNcqLj+uvpttV1HoUiJU6lo2
-=RFck
+iEYEAREKAAYFAk5q/LMACgkQxeMuLWsGW/vNVwCguPXaPGtijus/KA6uASzrnChZ
+dAAAnAqLY0IvccbjGnHd3JIO9qweZcko
+=9nhJ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.3.1.ebuild b/dev-python/django/django-1.3.1.ebuild
new file mode 100644
index 000000000000..e31b3abac901
--- /dev/null
+++ b/dev-python/django/django-1.3.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.3.1.ebuild,v 1.1 2011/09/10 05:56:53 djc Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit bash-completion distutils 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="http://media.djangoproject.com/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
+	sqlite? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )
+	postgres? ( dev-python/psycopg )
+	mysql? ( >=dev-python/mysql-python-1.2.1_p2 )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-0.3 )
+	test? ( || ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-lang/python:2.5[sqlite] dev-python/pysqlite:2 ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS="docs/* AUTHORS"
+WEBAPP_MANUAL_SLOT="yes"
+
+pkg_setup() {
+	python_pkg_setup
+	webapp_pkg_setup
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		einfo "Generation of documentation"
+		pushd docs > /dev/null
+		emake html || die "Generation of documentation failed"
+		popd > /dev/null
+	fi
+}
+
+src_test() {
+	testing() {
+		# Tests have non-standard assumptions about PYTHONPATH and
+		# don't work with usual "build-${PYTHON_ABI}/lib".
+		PYTHONPATH="." "$(PYTHON)" tests/runtests.py --settings=test_sqlite -v1
+	}
+	python_execute_function testing
+}
+
+src_install() {
+	distutils_src_install
+
+	dobashcompletion extras/django_bash_completion
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		dohtml -A txt -r docs/_build/html/* || die "dohtml failed"
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/media/* || die "doins failed"
+
+	webapp_src_install
+}
+
+pkg_preinst() {
+	:
+}
+
+pkg_postinst() {
+	bash-completion_pkg_postinst
+	distutils_pkg_postinst
+
+	einfo "Now, Django has the best of both worlds with Gentoo,"
+	einfo "ease of deployment for production and development."
+	echo
+	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"
+	echo
+	ewarn "If you build Django ${PV} without USE=\"vhosts\""
+	ewarn "webapp-config will automatically install the"
+	ewarn "admin media into the localhost webroot."
+}