bumps wrt to Bug #508514

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

6 files changed, 289 insertions, 7 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index f42da09c631a..202e178799a6 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.121 2014/01/17 06:17:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.122 2014/04/25 00:47:28 idella4 Exp $
+
+*django-1.4.11 (25 Apr 2014)
+*django-1.6.3 (25 Apr 2014)
+*django-1.5.6 (25 Apr 2014)
+
+  25 Apr 2014; Ian Delaney <idella4@gentoo.org> +django-1.4.11.ebuild,
+  +django-1.5.6.ebuild, +django-1.6.3.ebuild, django-1.6.1.ebuild:
+  bumps wrt to Bug #508514
 
 *django-1.6.1 (17 Jan 2014)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index ed0c284801e2..5822f8bcd768 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,19 +6,25 @@ AUX django-1.5-objects.patch 1470 SHA256 6b0ce991c1b9c97d642faf9f5aa554796c2fdec
 AUX django-1.5-py3tests.patch 959 SHA256 62fbb00c8d919306b48c8fcc82c7fa5e8aa38589f5271c526757da0ff2acbaa7 SHA512 cc746d43c2cc1c7f88fbffbf07ffc1f3b3fdcb738547658623c763e302c69372f8c8c014ac2a7196382d21aee0ba2ede92860a59a76ad3e14541015969935a92 WHIRLPOOL 4da24b4006ff233fea8041127a2842485d7d178d5abba2b429f537a66feb21384a59678188451089429af355118f06fc7083cbdd61d12905f9dfdb4e831d668b
 AUX django-1.5.4-objects.patch 1467 SHA256 237d0ee4e9f2af1d98b0b230977a41d061cbdbefc153193bc1539c4ad82622ee SHA512 09bdaab452f692679a15d0fbadf3c044417aeda0ce65b30bd2994d86b33ae93c13eb159fdad373a031ab2e0563861e29d1f9935b52c33af34a6afd25461e904d WHIRLPOOL d8a18947bd826c28836ce5180a6f9de758722fcc45ba11ca6a887c65711e7fa23827dcab734b6bfe51c330dd05a2d67a5d82e6e2d85130cdb05fcb4ca0622f26
 AUX django-1.6-objects.patch 729 SHA256 ea217c069a28b19063fcf216433cab48bd693fa51db0585881905532575a0875 SHA512 e7dc3cc8e50b4b0d546983dd79f1fa2bf7680d04d1e401267334ce72ee065e0fac2b00f9287ccafc3fabca29bca4c1d6475021b5da19d145a2d90fd491bb7ae7 WHIRLPOOL 00b4f579809206c78ce1648059c56a3af146c883c1b36f4febede15b4d3075a3686b30a6feac8d03c1df5e45994da5a2fdece6bdb71afb8d16bb72e139d67931
+DIST Django-1.4.11.tar.gz 7752172 SHA256 4819d8b37405b33f4f0d156f60918094d566249f52137c5e6e0dbaa12995c201 SHA512 60cc3c769a9b21e93e6c4e79132ab8f4a48df1cb1c55faaa547c5fd28b9785ddca3b5393790bf96a4715d9b708c6da376ef4a28ec14849147d63f0fe40d386cb WHIRLPOOL 5db11c57bbfafafd9484b8674412b32cfb3531b11b5f51e7b73a313c24473b182b014ba2ab193373c1796bcefc38c85580dcda05f2aab32463db4af78afd232a
 DIST Django-1.4.8.tar.gz 7743397 SHA256 b9c356411af17dd9017081c884065976745659b3ab0e80493d0656911f920a2d SHA512 f2f0ed16308a9c2559be093f213fb6fef6f7afb4ceed54ee176167baa73191272da2a48c342ac4eb7d582dafe8052ef5c9246b62c2298f16c32ac119d16f7c5e WHIRLPOOL 6f275ba2bde4bce6714ca38290fa82b9713701dd5bad813508f0bee9c9d40c7b3ac14976f0b026e7ac06d61795edb434ab2d9666257f5bd5817f0e7f61a0d845
 DIST Django-1.5.4.tar.gz 8050758 SHA256 428defe3fd515dfc8613039bb0a80622a13fb4b988c5be48db07ec098ea1704e SHA512 daa4b5f8189446feefc168fd618a7cb2bea710b83066e0ec740f7596988107b5da45f2150fc99efd2095356bf87f2c0750d486e8c9b006b6d61468de8fbef748 WHIRLPOOL fe78575bb8b717261cb588deddc80534d70f8d147e807ad6364eaa5d2e785cd076c19be22c54ef602ee4e37d82ee54150788ea8237b19bf48b0b0e3bab3b5eb5
+DIST Django-1.5.6.tar.gz 8068359 SHA256 9b7fcb99d20289189ec0f1e06d1d2bed3b4772e3a393fddbfb006ea7c3f9bfaf SHA512 df266732742e4ff50d362aec870e9ca08213ede80894ddd297d1fee2141ba44b728e8acb4869cb3b50a06517fb04ae66d30e57deaf7e1426e886a5e094b41741 WHIRLPOOL 0f392d9ddf9ae0e3c503b7519e4f626931ba41f4d40f8def7df401e57c53c3c11ebf45ea334183d6c9d5cc400a9bf23cd514620ec1da46beab9c7b57d86f7e4c
 DIST Django-1.6.1.tar.gz 6608178 SHA256 cf011874f54a16e7452e0fe1e7f4ec144b95b47ecf31766c9f1f8cf438f09c06 SHA512 49a1b0582b8b55638d47447a688c38e6c9e709b89cdcdd001995e156298f7f5dc26b847f11f9551ad668bf0225ac98f570a027091ed386db0e566f6e5c564bfe WHIRLPOOL 64061cb87fb059a5800ef1618972c12dca434be6c715417a43a74f85ebbd6a9d2a9f0e8049b92628a3f601213a1680fe30804433f1569edb2c52a9bed0072b34
+DIST Django-1.6.3.tar.gz 6628812 SHA256 6d9d3c468f9a09470d00e85fe492ba35edfc72cee7fb65ad0281010eba58b8f1 SHA512 3b5167df5aa1d2eacf5ff1d989e6304f8f86f71d69aa9aff93d4f1b3b8459d1bec0691cc49007c4e20e700f86849b95affd2dee212fd46a6a4732c2b540f568c WHIRLPOOL 1e740899757544fe64458be6815da538bb59a96f7cc8dbd60965cf1676b14586cb769db5f1db7b1e80d054ffae85825856f62265b4d1c0e49f6c1940adbea224
+EBUILD django-1.4.11.ebuild 2573 SHA256 7c3ae0eb994d5433c196e1902c1e393f7351067aca0779348131611e282ab22e SHA512 b2d5be64e0ed239387a7edffa7ed7bd164f1df0a9738de9d1db2650197224782ed3ccc44894ddd78b00684f35aed7092707b84466c39031e066fc8b037b4fc19 WHIRLPOOL f072cf90fbc25c02ed0629c3e396c312b1327d4dfb5b302dce47664e9319422320750a5c820e81da98f550597c5a7b4665d4b906c4e5130ee35bc17a62c54b8a
 EBUILD django-1.4.8.ebuild 2777 SHA256 ff11e4c9a6ed8447f6f3ed78d587b589a2949568fb443b0566d17445db872d6d SHA512 c05f6e5ab15f353ea32ece242caa3f487f0d031793b27f7f791d1d2daa6404f7f4b5b11e56f342e1066bb77a963a7b558e336092edbbd409e1d10c7b6040d3b4 WHIRLPOOL 6efcd3fd4cd1b7831e7a3b16fea28ffbfb1c11b0e91bccb513a60832a9f66bfc9b457608a694b2026fb284d3c575b7a81bbcb2bd9f4fc187eb7145b7dc93d8a0
 EBUILD django-1.5.4.ebuild 2391 SHA256 0e1e520adc04c15d291517d5688ae8c8ff87d2172426399182dd690499196ef7 SHA512 d8745436b9f62093b01489c9182db79cc364b127134f5d7da7071ceb07030c68fcbda462d52ec93da2710a2592e105af54411217e1d968d0c3b0b4b8987a4ecd WHIRLPOOL d50713b3c8a5caa4ac10ee87e6ecef78fc2a6a1f2cdcd7b8afde6b13d501a74dba866c3def43283c72cd4789ea1094e58869af48e47d953e4058442444942905
-EBUILD django-1.6.1.ebuild 2712 SHA256 d10a1ce8c7b14fe53fbc4ac569fb9b466f0e7a68b08faf35b0bfa1b9bd9f4dd5 SHA512 a4ce64743068a1aacace3664814d8d543a53a3a5d7c8e24bbf6e53efb5e0aebc121784a7808e4f27b524025877ddcc9cc6d17998120c88ed5c285dc58d1d4049 WHIRLPOOL b4282216c9ce550e87442b2e1fcbb8b37cadbbcaf79fa955eeecfffa985b430abca28652f1a01653856aceb2b31faa6cf1492a0348aa765dd17717ca3d38d4d9
+EBUILD django-1.5.6.ebuild 2536 SHA256 5e99ed98c491932f93e16d3a1f82d363079dab3786357415e140faf031491312 SHA512 cb3ed212e139117c1921b575fa4062031bf996aff12ef6efe34f692808542f8adae806a3c25a38759c17b340697b81c2014b84387e8d7e740b69bb9d271e9db1 WHIRLPOOL d589f041f8dbe2be9727d06e309ebc249660dfd83089628eb250ea1e423f87cd639cf71b7be0924ef39a216365a357129da559424f205913d2df8f3286024577
+EBUILD django-1.6.1.ebuild 2780 SHA256 0f9e4dfaed637b13ef0be0485578920638044e2bbdb68b3039ec9710940ea1b9 SHA512 fbca2ceb5aca326d8c5dccb1b7c7a9175457f09b0a9b00d606a93c65301284092739ad1de6e1daa41309910917ff83cc8b5033b10c956074ed6275b1e129cdb0 WHIRLPOOL 685c14595207d2a17ad2d5b501be6a15dfc02b053ebc5e64972039d95a6297489c16929802a44c9fb07bbd4e2fab4e220119d4fbc9144748863e8f2e1d4cc0d3
+EBUILD django-1.6.3.ebuild 2776 SHA256 d86701a1edff7d4882233f02ba267f327d53ff56ea5806b201b92b36972c4423 SHA512 a1ed05ea0ecc1c7b601a3e20292f0e6603fa84ec8d484c378f1710ca48e19ad2f9f59acd9a1540be90294064813a577e063650e66c6a9e220d5539ac734bca30 WHIRLPOOL 6dc5ea6de29f833cf885866ef4d09627bc594b7b6dbe6cc9c4adcd6341101b07cf5c075d42564f9662814d16481210e1e8ea2b9634742d132e8ec9775c25e38c
 EBUILD django-9999.ebuild 2378 SHA256 7bab217e56b3cbafc16f45b32462afc0ad791658c123df2100e2336622332fcc SHA512 bc2a6a3217627133b74115c02f93eaf71b250f410f39f433baf86da74dd45bc7c8b191b10fa40ef299f1f9a98f0a12f223953c6050321f246052a2ce90cf588f WHIRLPOOL fecb6f73ff804f70c468ffa79d64f12aa5960c171f61be323bbf0a5cfde35c042752bf8e61c3af1b1a50ab64002c675120381f4412a3fb37d0861efa1d14dd43
-MISC ChangeLog 18759 SHA256 32ee9e279ffac1edf93797efd693ce556d479a5a3c8a679ba9f94af5a49b775a SHA512 d1b7c5e786db5e7bee46050b6cc551d7610dbb8bcec83232c268a55ef7634e485dfb33b8e8e4a73526472a580ee6ee60ea6a2f5f365fccbc572d6073e32451ff WHIRLPOOL 3cf5633f183f2273cd861b160aac62875cee6e5e7191606ef4506f75d1549bbdc24df9da69ae8f17e999a200f4617d1a9439ed5a2ddcf3491141f1b061bcb533
+MISC ChangeLog 19011 SHA256 2b2cafe46528c05a750719ebdd6518e7ca4631c8c63c13e215e8091627b3200a SHA512 0e3b44ae2b6a681d49bbfd8372bfacbfb320bb91d0d679d5593b5838e8b7b193873d6f4d6bd8fc1d4c92618941c4e52e89f4f402d33f4f8ceae35c4a0fc779eb WHIRLPOOL 8b62040b2c7552b50b88ee4a2909548cd12c40576bd4ba18ef25feb2af5be1d88b2594d371195fd4162e386fd30601d41862979fe9998525d5048630cfb1f9b7
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLYycoACgkQso7CE7gHKw3lkwCfYP1kKdrjxbqRiO6nmcmrbLG1
-KKAAnjFX3fC9mSulVuw7YW+lLIZ6/YGw
-=qbS1
+iEYEAREIAAYFAlNZruoACgkQso7CE7gHKw3YOQCdEODD3Pyp6WwnuuWAV2vly09U
+zwYAniVmW35PTyWhkBwyukdFXKJBpnLQ
+=uf4x
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.11.ebuild b/dev-python/django/django-1.4.11.ebuild
new file mode 100644
index 000000000000..c797812cf2be
--- /dev/null
+++ b/dev-python/django/django-1.4.11.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.11.ebuild,v 1.1 2014/04/25 00:47:28 idella4 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="mysql postgres sqlite test"
+
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	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_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}
+
+	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-1.5.6.ebuild b/dev-python/django/django-1.5.6.ebuild
new file mode 100644
index 000000000000..9b08ffb6843c
--- /dev/null
+++ b/dev-python/django/django-1.5.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.6.ebuild,v 1.1 2014/04/25 00:47:28 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+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 ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5.4-objects.patch \
+		"${FILESDIR}"/${PN}-1.5-py3tests.patch )
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	# https://code.djangoproject.com/ticket/20514
+	# suite doesn't run under py3.2
+	if [[ "${EPYTHON}" != python3.2 ]]; then
+		PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v1 \
+		|| die "Tests fail with ${EPYTHON}"
+	fi
+}
+
+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() {
+	newbashcomp extras/django_bash_completion ${PN}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}
diff --git a/dev-python/django/django-1.6.1.ebuild b/dev-python/django/django-1.6.1.ebuild
index c3f56a9d162c..421f537e6b0f 100644
--- a/dev-python/django/django-1.6.1.ebuild
+++ b/dev-python/django/django-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.1.ebuild,v 1.1 2014/01/17 06:17:57 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.1.ebuild,v 1.2 2014/04/25 00:47:28 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
 	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
 
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
+
 S="${WORKDIR}/${MY_P}"
 
 WEBAPP_MANUAL_SLOT="yes"
diff --git a/dev-python/django/django-1.6.3.ebuild b/dev-python/django/django-1.6.3.ebuild
new file mode 100644
index 000000000000..c1febb5de54e
--- /dev/null
+++ b/dev-python/django/django-1.6.3.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.3.ebuild,v 1.1 2014/04/25 00:47:28 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7,3_3} )
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+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 ~x64-macos ~x86-macos"
+IUSE="doc mysql postgres sqlite test"
+
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	mysql? ( >=dev-python/mysql-python-1.2.3[${PY2_USEDEP}] )"
+DEPEND="${RDEPEND}
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
+
+REQUIRED_USE="mysql? ( || ( $(python_gen_useflags 'python2*') ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.5-py3tests.patch \
+		"${FILESDIR}"/${PN}-1.6-objects.patch )
+
+python_prepare_all() {
+	# Avoid test failures with unittest2 and Python 3.
+	sed -e "s/from unittest2 import \*/raise ImportError/" -i django/utils/unittest/__init__.py
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html
+	fi
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	# https://code.djangoproject.com/ticket/20514
+	# https://code.djangoproject.com/ticket/21093
+
+	sed -e 's:test_dont_base64_encode:_&:' -i tests/mail/tests.py || die
+	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() {
+	newbashcomp extras/django_bash_completion ${PN}
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources
+		local HTML_DOCS=( docs/_build/html/. )
+	fi
+
+	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
+	doins -r django/contrib/admin/static/admin/.
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "A copy of the admin media is available to webapp-config for installation in a"
+	elog "webroot, as well as the traditional location in python's site-packages dir"
+	elog "for easy development."
+	webapp_pkg_postinst
+}