drop vulnerable versions wrt Bug #521324

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

5 files changed, 10 insertions, 287 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index a70b90e0a33a..679c8c9b6642 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # 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.140 2014/09/02 07:35:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.141 2014/09/04 14:25:21 idella4 Exp $
+
+  04 Sep 2014; Ian Delaney <idella4@gentoo.org> -django-1.4.13.ebuild,
+  -django-1.5.8.ebuild, -django-1.6.5.ebuild:
+  drop vulnerable versions wrt Bug #521324
 
   02 Sep 2014; Agostino Sarubbo <ago@gentoo.org> django-1.4.14.ebuild,
   django-1.5.9.ebuild, django-1.6.6.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index fab21a13838d..6e9e9d884abe 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -5,35 +5,19 @@ 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.13.tar.gz 7753532 SHA256 a8fede657378b6862744b19012e7071279b952ecd208fd83227723866068f2c0 SHA512 de9b095e28334d095e03067d931ef1f2bb24332d739b5f10cfc524ca20d15d94fa756fb80394c306ea2351549f6a7669acf491e44f29cfc0b220f620f9a4b080 WHIRLPOOL 72aba9cd46327f0bdece26823e7258a9bd39bb556bb0d52ef467105e2f44cfb0b6ba451b545dba663479abfe870ceabf561b1510e8e871a61672855b9c1bd3b4
 DIST Django-1.4.14.tar.gz 7754876 SHA256 81edad81211fd515677a35ab2d40833557649dd650f150baf8416f416b8a6c9c SHA512 b7e2e57d15bc5eee62aa0425932c99928cceb3f4bfdc28de42a96ee9ba2bdc0c28e7e102846e7ea3735eaaa00944b7aaeb0bd8625216dee2fc406f0be2601892 WHIRLPOOL 02689da58ab0d70a8f8e0f388a6f8ca9e25091fef0fce0ade0cada9072906bb7a4dc0d81728c9f0509a0c45b55e93e66bae8a85c6356ef66ddb911b3895e9546
-DIST Django-1.5.8.tar.gz 8071329 SHA256 01db30f38a081241a9cbc7bef12cb599506b80727613350e427547bed12aaaa3 SHA512 446e4e9ff59290816247ac750d6b311e520d0491304ff601946c41689bf1589f380c874624bc67a5850baeeca8c0bab494a66e42ad3562785780d424cfdaa2fe WHIRLPOOL b49486b6ea9baf2a3ccb8cf3774b1d010c429298edef79e91b5a39cadcb1bfed3ac4b8b3b59e7ded05737eb7694eca5177c8f2d459782107495441209b230041
 DIST Django-1.5.9.tar.gz 8074400 SHA256 47ce505c5046c38817828bee253b7256872f86c4340db1af698cb8548dbaa0d2 SHA512 0b42f09a6bd28b18eaaf6b1788fcc620ee410442c4f179130babed3fa6763155cc5469e1b38d68a87742a21f34e0ac343167dd7a9de0595c81e81a25296a1087 WHIRLPOOL 817e88b2a82b48d6c7f2f78091f66b786227b5513be01f99c90a5ab36920e5d15167dc209e9954641d61536e62e396719224fbd4b5812e349ccf59e48ff1d72b
-DIST Django-1.6.5.tar.gz 6633768 SHA256 36940268c087fede32d3f5887cce9af9e5d27962a0c405aacafc2a3cc1f755c5 SHA512 60d36b1b23cdda42f33d4c15e41053fe0fc1c6584617bd6ed683dfb0a6d6dfaa849b387ea514129acb2cc40e89fe33818db1e0897df110d1b8f5ed1a3b256905 WHIRLPOOL 0e284ed126b7c7b065a2a6929a7cd179aee63bca490f8e639facd0413c5313f2131ec18a8450429cbfb2ac034bd67c4d7ab94b2fb64df4a64c5f6dac876eb489
 DIST Django-1.6.6.tar.gz 6645456 SHA256 536cbd54e533ba3563d205f0c91988b24e7d74b8b253d7825e42214b50ba7e90 SHA512 4d52ed7e31df7d1b449697e5ecd48a94cbb365a1f0abe6b9308ba815b1ef80d2c38d8ba07a57f928617a592afaa44d48374ecf3901b66e68d389fc4ac4f6891d WHIRLPOOL db69860de31c2283faab0931818d215dab12cb36ed1f8b3160d0e1b5ed49c72b66b751b086cd454acde76c5c1b003ca89fabbdf88603de7b4cacf5df4385d3e0
-EBUILD django-1.4.13.ebuild 2557 SHA256 6324a5fbedc0d5bb5a256670dbada2adf7ea89eb6f37f484a10be9ae38bba5fe SHA512 5ba85fa019466d49006e0529c75f52c961744cea4406061dd67a4ee42d702811772f0ef20269df809b66590f7d97f9cfd6fc2d903d0b1258d0ef1b9179dd3cc3 WHIRLPOOL 1abeb48e97e637bc459a20e050273379d7017950e02c76de43031b540fe1190b509e42cb4e35cc166b2a0874a39d9303283bb17342fa3af65630d8fbfbb5a6c7
 EBUILD django-1.4.14.ebuild 2557 SHA256 c9b15a402c64e4faca76c8fbf6dfce82337dc182ca7ce153e546b95e91eea17f SHA512 ddf443a02963a5ad6decfa2695bfdb824ab1b107adddff2fb6f063de7b3a0ec16c837792a180da47b89ab3a2237ec58423eba68a53de3bf7bd92e04187fdbdaf WHIRLPOOL a7c53d1deeace93ec1f7ce9450c50ca2add66b64842f19121c25610d9909de69c40cf8f40294fbb892da8a0c658709d09e1a183438767d4252cd391c329dc63a
-EBUILD django-1.5.8.ebuild 2569 SHA256 d3a762b98ae394170ec901853b2b44dbdbeab0182391b8b2cf189ec368b780e7 SHA512 774d461a68bbb245c245d1e39687b4bbda7c040a5a8369bb5d5c7800493f74a018c8870d1f68f0ef483e5de9256ed7faa0b7cc07ec31c449232102e97e3bc180 WHIRLPOOL f83d42ca4e7c9ff5be3dc02fad4587a45e1bb3d25f8116f8539a34ba578a1e2f93a58bfd60d1ef01afb012e46d072cde4c8cb0944cef3cd110f099a520d01c1f
 EBUILD django-1.5.9.ebuild 2569 SHA256 b735074b0aadcab45b759fb0657d0a5304e6d2f17297aec824ef6107de5dd33c SHA512 ca0c262ed213b76bd756f669db4b0014a75b82d5c82b9296b4badf3ca6ffee5dd2d47679f0852f705a187ff675d2bfe7b623ee4730362ef8a5e556f60343c2f1 WHIRLPOOL 4b63d45f100b36769ae9f95c517efdb6f3c2ca0a4a81f6a876e89da26dbe5af97ec6a9777d856e58b03a4e4aa765593c2aa811820bb3907fa58be74c30769e5d
-EBUILD django-1.6.5.ebuild 2822 SHA256 b22170e5940b4efb7a306b8da94aa7443442de3fc80bc325e66d0d9850df11f5 SHA512 1db6a4e97a48b1326953c1fec762da71137e7295c459518ee7e5c6565c791f1a16e0af87b29c25ad18f4907c2525163384558a2f0e1d46cb07eb9c9ee8298479 WHIRLPOOL 8d496a8078c198a518a570e7c48f10293bdb27c1d503cc8693193074a18ea8a9a025410d477e98f76be2384861c33c8c5a89a2eeeac8a3305ffc0292bffeb882
 EBUILD django-1.6.6.ebuild 2684 SHA256 3c8b388d16b86e1f9c626bfeb530eede945e11db23803b5ae78a13af53d9022e SHA512 1245ea8a5818523af6386897eb9abb0b234243c9123f885f8d17b3063a200b6abb475106f770870a23df4f740f76edf1c152d8dfc72c18447abc6d9e2d2b80a6 WHIRLPOOL a365f416c1d744374559dbf2db293341d4f2125ea0d520853c26a381f3a4100b2c49eeda969ee4601be474c200fd380a59f5ecd14712d88b100242f20c1ff56f
 EBUILD django-9999.ebuild 2378 SHA256 7bab217e56b3cbafc16f45b32462afc0ad791658c123df2100e2336622332fcc SHA512 bc2a6a3217627133b74115c02f93eaf71b250f410f39f433baf86da74dd45bc7c8b191b10fa40ef299f1f9a98f0a12f223953c6050321f246052a2ce90cf588f WHIRLPOOL fecb6f73ff804f70c468ffa79d64f12aa5960c171f61be323bbf0a5cfde35c042752bf8e61c3af1b1a50ab64002c675120381f4412a3fb37d0861efa1d14dd43
-MISC ChangeLog 21742 SHA256 1c8681f5f70176e14d8280d5f19ea6a1d363b238008f5e9ecc8904ce4fabd3de SHA512 e64fcf942445699938f5d9923fd908ca28a521f6d399dbab142783c444f7900d11d18ef9bce3bfce7874999110d9618bcacf237bbe92cdf105ae21f758f5d9d4 WHIRLPOOL 20682a2d8076424d1e21fcec3c452866bc228dfe94450de08f63be9d8ffadaf835f78f3e983df6ee6fd80d595c10a429299e44da4554b0a05212b7862040c154
+MISC ChangeLog 21907 SHA256 9a480878631d2829ce492eb75757260e68063efe6e28e0c162f1e24d1ad22f5e SHA512 6b89bbd2603366f0b5530664f2ca5059a31f5c0343a0728868b778cedb0e9cea9e6970ab2c874b5a3edcefc04832848c910bca91de7ba2e508e097a0489a461a WHIRLPOOL 9a65c5bb856b11efd5a0b02f9d029e9fc8e7f17d4ad797b361f4ff5745297a9e044ddcd2ad16d3fd2dd187d06fa42c5dd24e2509849ae6e8a7430c34ad19307a
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJUBXMuAAoJELp701BxlEWfWuoP/RCqY6CFCnY0oQTiE9BfzkK+
-X+uL2RaSJ08RSk4e6oeg5mLFiYVGBU5xVmRWRBUvl/vPyf8dh180/PYB75DVm+wm
-bbsCfx810L8V4daXm4Q9tXFPwJNIXk2IgmfGzYxUgyP+hffiA1bpRKkQKZWTAtcy
-MGhl6umvjrewoYcXVpovryugRx4LhwmDM+1UY8KpIgRkgXTwTRiZvRe4yNcBvSQn
-LAZ1snldnFilxfWb2bBoNd46A66t9wUTkHdjcf69ahxmH97oM1i9lj93MCCeY61v
-/DTD+aFWumHEIw89NpVmaj0fq67D13z5SW7TJ6V8Cb9ydd6IFaj+spjVCklo/mJX
-lQPY0em33YH7/fIijzC7a+324kA+7+K4cLa6L7FeJypXhaE76Z1qGlyW0QfVV0Ch
-4CCkpna1E+8ZgyLX6Qtlw8tRLCwTQP8Zz3YyGJuZeUq0o/E8M+lL08pOYNdgjMN2
-/2CTkKjNZY6080ndqScQFsiQYgEKxQnzau+2xYpsSxYUof2y9CHCmCr7Wn3ENmuC
-wqwcKuwoCVAnLMK32kOoyfakvXSU1TDF92Mva/HJe5nRCWvEptGdA7ITfutfYsNS
-urcKxhPq3b4XOiwpmCf/cX918Q65OxPXQUk6m9PoQRy99MeHVBrymTzFZHTOHHhf
-XPOcCxB81VopvGnD6ZxR
-=mnmD
+iEYEAREIAAYFAlQIdCkACgkQso7CE7gHKw2HRwCgqqBNGKyROSeQGR9EnEercRPs
+B3QAoMWl9zWUkqjY0CAb71Iid3+H7uNg
+=XkCV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.13.ebuild b/dev-python/django/django-1.4.13.ebuild
deleted file mode 100644
index 882ada2f3d91..000000000000
--- a/dev-python/django/django-1.4.13.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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.13.ebuild,v 1.3 2014/06/08 10:59:43 ago Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_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.8.ebuild b/dev-python/django/django-1.5.8.ebuild
deleted file mode 100644
index fa0ad957ce8f..000000000000
--- a/dev-python/django/django-1.5.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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.8.ebuild,v 1.3 2014/06/08 10:59:43 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_2,3_3} pypy )
-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_7)
-PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
-RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PY23_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_7) )
-		postgres? ( || ( $(python_gen_useflags 'python{2_7,3_2,3_3}') ) )"
-
-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
-	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
-}
diff --git a/dev-python/django/django-1.6.5.ebuild b/dev-python/django/django-1.6.5.ebuild
deleted file mode 100644
index 0f03ef435e81..000000000000
--- a/dev-python/django/django-1.6.5.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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.5.ebuild,v 1.4 2014/06/08 10:59:43 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
-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_7)
-PY23_USEDEP=$(python_gen_usedep python2_7 'python{3_3,3_4}')
-RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
-	postgres? ( dev-python/psycopg:2[${PY23_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_7) )
-		postgres? ( || ( $(python_gen_useflags 'python{2_7,3_3,3_4}') ) )"
-
-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
-	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
-}