Remove old, vulnerable versions (bug 510382)

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

5 files changed, 19 insertions, 257 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 2956ec1b70b3..72c01784d28a 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.135 2014/06/08 10:59:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.136 2014/06/08 13:07:50 djc Exp $
+
+  08 Jun 2014; Dirkjan Ochtman <djc@gentoo.org> -django-1.4.11.ebuild,
+  -django-1.6.4.ebuild, -files/django-1.3.1-djangodocs_extension.patch:
+  Remove old, vulnerable versions (bug 510382)
 
   08 Jun 2014; Agostino Sarubbo <ago@gentoo.org> django-1.4.13.ebuild,
   django-1.5.8.ebuild, django-1.6.5.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index f39342579c44..61d568f10abe 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,38 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX django-1.3.1-djangodocs_extension.patch 1879 SHA256 fbf7b2383f18f03755f30fe9a25e05d994aa22d7a6832b92073f5a3dcf7a0a87 SHA512 54f14cd523ffb87cff1e768e656823a41d7ee7a29ccf2f2759622de1f4285b74b9e74810803af328cf3fdddbb97d35ec632ba8673a19713c6d8e06d174978d25 WHIRLPOOL 9a723ae60a3917ac16083e7ab4d19b8009a3662ef89bb91f8847b7f413907cb329419f4f9e97e517a07f99c235b5a2d0c2d26840e65dad26f6343aa572511487
 AUX django-1.5-objects.patch 1470 SHA256 6b0ce991c1b9c97d642faf9f5aa554796c2fdec52cc0f78b6447626a4f9f6816 SHA512 c82592ba39b121111c86d8713a24e6120a27991e057f9c034722e2054ff51a09e4cdce997a9059245a602c9343ab8b8930e14cb36cfd088da2b5e44e11d13cc4 WHIRLPOOL 84bd83ae54f8cd62dec2973e064511814205789fd8031fb6ad142bf0e865f4af32e34dfcb1bf82476a2e0e58df75ed6424d646fc618c353dedf8015f0c2bdb70
 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.13.tar.gz 7753532 SHA256 a8fede657378b6862744b19012e7071279b952ecd208fd83227723866068f2c0 SHA512 de9b095e28334d095e03067d931ef1f2bb24332d739b5f10cfc524ca20d15d94fa756fb80394c306ea2351549f6a7669acf491e44f29cfc0b220f620f9a4b080 WHIRLPOOL 72aba9cd46327f0bdece26823e7258a9bd39bb556bb0d52ef467105e2f44cfb0b6ba451b545dba663479abfe870ceabf561b1510e8e871a61672855b9c1bd3b4
 DIST Django-1.5.8.tar.gz 8071329 SHA256 01db30f38a081241a9cbc7bef12cb599506b80727613350e427547bed12aaaa3 SHA512 446e4e9ff59290816247ac750d6b311e520d0491304ff601946c41689bf1589f380c874624bc67a5850baeeca8c0bab494a66e42ad3562785780d424cfdaa2fe WHIRLPOOL b49486b6ea9baf2a3ccb8cf3774b1d010c429298edef79e91b5a39cadcb1bfed3ac4b8b3b59e7ded05737eb7694eca5177c8f2d459782107495441209b230041
-DIST Django-1.6.4.tar.gz 6630474 SHA256 ceee0beea79b1926c767aaa837e1b9e621e5f6b7d27138d90474b3917ca5527b SHA512 319e0ee8f71073b0132d3e06ffccca8580adeece0183dc064492ccd6d4f2d60e92fe89191b9d35ce44d5c391a02388b464821d2048a7fe87886d7556f0b95aa7 WHIRLPOOL 232a66bcaeb99ead521eca157ef9df83b866a6224cb4d162fd37dcff7cca71fd6cc0f318a9480fd7a8b15f35da4bed4ab7905460d701e8a766e362627f394b13
 DIST Django-1.6.5.tar.gz 6633768 SHA256 36940268c087fede32d3f5887cce9af9e5d27962a0c405aacafc2a3cc1f755c5 SHA512 60d36b1b23cdda42f33d4c15e41053fe0fc1c6584617bd6ed683dfb0a6d6dfaa849b387ea514129acb2cc40e89fe33818db1e0897df110d1b8f5ed1a3b256905 WHIRLPOOL 0e284ed126b7c7b065a2a6929a7cd179aee63bca490f8e639facd0413c5313f2131ec18a8450429cbfb2ac034bd67c4d7ab94b2fb64df4a64c5f6dac876eb489
-EBUILD django-1.4.11.ebuild 2561 SHA256 522ae454973aa474dfae22f82d8334ef5f460ada5bb994068336c58d20ffbafb SHA512 a8de7f60eaa5362fc58af6b09fda508b662f2ed4c035cb4c965ad99acfb064c9c218f52aa3667e2cbbd697934e954ef9b8c896205f8ed8d8c16146f54d451b78 WHIRLPOOL bfdf7fbbda7ed06c086db9ba741a77f8a31b17ef790527ef911e442d1b4a1b19b099ba49deb2d4291f1e32ce3736e895e57bcf77d9ffe7ddd1f837671e94d239
 EBUILD django-1.4.13.ebuild 2557 SHA256 6324a5fbedc0d5bb5a256670dbada2adf7ea89eb6f37f484a10be9ae38bba5fe SHA512 5ba85fa019466d49006e0529c75f52c961744cea4406061dd67a4ee42d702811772f0ef20269df809b66590f7d97f9cfd6fc2d903d0b1258d0ef1b9179dd3cc3 WHIRLPOOL 1abeb48e97e637bc459a20e050273379d7017950e02c76de43031b540fe1190b509e42cb4e35cc166b2a0874a39d9303283bb17342fa3af65630d8fbfbb5a6c7
 EBUILD django-1.5.8.ebuild 2569 SHA256 d3a762b98ae394170ec901853b2b44dbdbeab0182391b8b2cf189ec368b780e7 SHA512 774d461a68bbb245c245d1e39687b4bbda7c040a5a8369bb5d5c7800493f74a018c8870d1f68f0ef483e5de9256ed7faa0b7cc07ec31c449232102e97e3bc180 WHIRLPOOL f83d42ca4e7c9ff5be3dc02fad4587a45e1bb3d25f8116f8539a34ba578a1e2f93a58bfd60d1ef01afb012e46d072cde4c8cb0944cef3cd110f099a520d01c1f
-EBUILD django-1.6.4.ebuild 2944 SHA256 f021fe9fec187bbf77fa63a01c96358a1469a08cc1306313bd87d03806e77a19 SHA512 d46eef8c0c63ffd79acc5fc195f1557c0ccc38ab1898eb5d8f3fe59431f039cd4981659d4f91917698462164cefe6c91b9e49d31304acbb615980634f83011e8 WHIRLPOOL bfc8b691600d49c172a04c2379860c2adcde45c562783ba230f7b47b9a52e546de590783a3b83106dc6a8d6349b2c72383d4c608e2b4dbe14c451989702418ad
 EBUILD django-1.6.5.ebuild 2822 SHA256 b22170e5940b4efb7a306b8da94aa7443442de3fc80bc325e66d0d9850df11f5 SHA512 1db6a4e97a48b1326953c1fec762da71137e7295c459518ee7e5c6565c791f1a16e0af87b29c25ad18f4907c2525163384558a2f0e1d46cb07eb9c9ee8298479 WHIRLPOOL 8d496a8078c198a518a570e7c48f10293bdb27c1d503cc8693193074a18ea8a9a025410d477e98f76be2384861c33c8c5a89a2eeeac8a3305ffc0292bffeb882
 EBUILD django-9999.ebuild 2378 SHA256 7bab217e56b3cbafc16f45b32462afc0ad791658c123df2100e2336622332fcc SHA512 bc2a6a3217627133b74115c02f93eaf71b250f410f39f433baf86da74dd45bc7c8b191b10fa40ef299f1f9a98f0a12f223953c6050321f246052a2ce90cf588f WHIRLPOOL fecb6f73ff804f70c468ffa79d64f12aa5960c171f61be323bbf0a5cfde35c042752bf8e61c3af1b1a50ab64002c675120381f4412a3fb37d0861efa1d14dd43
-MISC ChangeLog 20980 SHA256 c1dcc0af5d046ad8b68f1a1350e979122099c2bbea6506bc6d7dc545fd6ae24d SHA512 d7bb96612bee1381fcad171b26452688a07a6aa0ad10112e2b04891762df733bc814eb65ff280ce072e75869068385345ec1dc89f4534a52bb722b1f3931264f WHIRLPOOL 76f4651715a24a55fc51f3faff49474bef008d437c64af071b77776e561860871b61a31bed0a1d3cb10d5d59e99f57de58e77f5f8214900a1c4b73cbfd760198
+MISC ChangeLog 21171 SHA256 46b21aa37943f6b2fbb7c5be0d82c2ca203b410e1374ee0c866f36ddbcb1183f SHA512 bead09cb6e39e03efa9ca5f79ea717c28c05657950164b7916970a4513aa7492cb686f4bbdce9345b77830b5bc9b6e2fb3a75f428c29c9a8f0b318a3a3e8badf WHIRLPOOL 831d30806f84554636b206402febf365ef42a83a4c85baae61b4ab010561937b73d47e0aeab98c941ab51456beeaf11adea4b25c651bb0e3bf4a678313bc333b
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTlEIgAAoJELp701BxlEWfEUUP/2K3P9jpe1NRYXnX60Nd3Nhj
-Ibo0DsVrokkpGtNbJKm4R6r2NvKqTnBnLhRIsWjf4kk4jX+/p55WXzzPtIZSL9ZT
-gAXjKY6+Zr//I8OH1yKp4kkqOAlb3u2ER7/h0k9UrewVkW6/SAgN8ylXhroKDFh1
-rxq6a/VmB3srObRdnlMIwcAlRuh22VybiONk+kB1yfT3hDJKlDTzVIoqpOKd2H4L
-QD3XJ2VmakVFODJGr9kKIJjITW8QtQAUSeeacpw0D0YV50LZa/xodWO7ol/e99IN
-QQO5AeXTTJWkfyToggiTBnmOQo/j2ONTb+DINJXFBwfD1xMuiwmspUZwEAgAwpmx
-PvDjoqWbgbB3JB8pzdi6r7KkDuAcXzVxpzfLt9D8gh7ZOGlCBho664CupexCGjxv
-hxtZqtTpoUYCZbOZ21yeumsy/i+WEnTackvwVk3956EfcGBsfExB1SR/0ZEFQsJR
-Ckz/a1t7d0s6432mubTA6cA0KVEG/inCyqCArWS92MEMPqLSy29uFkVUmBeIYIi6
-4dS+fM+bPWDyOljXJ4nSQ6tvKNByiVmFaepn73nxjy3hr0bo3eT/hcH6tlpESEcz
-RqN9TaBFXDJNPnIyL98VMci4SItpSIyq2cGmuaeitpK8GWBVZUAtJH7RzwvmLM1m
-RabIOtkQeYQg80zj0LQz
-=OpZO
+iQIcBAEBCAAGBQJTlGCgAAoJEJ+WuSkwOAOBKEMQAITg5qYM7ZmV5eJ7ThjvggCn
+Ya4eXa1vJ9Yvb793G6n/jD4n/Ge4p9kYfvUMAG+NhsgWczyah1XySkkq9P/GnLGe
+KzJj2+GGYu1tUgaus8W95KpkBDSNUlCGsuOCt32WW9S6M4/lnHQA/8HsT2YJ6WKu
+dQribILuCS1PQVQAfnWpYM2Mj1Vyd42P2s4aQSM4RDWGyvGzwXQ4ysRh3IX8SyYi
+Gj+viIMQC+Q5ZO6xW8e98HQTJ7w/6UmalgsxzzgMf7LwTybiQRmb7tHbbmpnIE20
+p58p0LjYwfZ4K4mXgtYXAcgMbSMPtJa9eaucJ7qaPmzfT15BMLc/nKk17zkaTMrQ
+sXuaQZYGBGaEnU7W5GZ454eyRsrNXgrMx9WFLH7dn+217Xf9G+GXs70MTMFCiH+c
+5oZtysMoZv3coZT8d7T4F4hvOa8YXWnGgT+lcYfQFzFgqqyx97TXlyXPd1Tpn9Cx
+m1C8x3hBc/9/o0Nseaxdsk41yfphXjqGj3AsyjijmWi+nwySfh9sXMyDZxxQ6jgO
+Oif/bEo75XdPI9XquJGFehMBenQlUjBVZXeLf/nh2LwF/27jVOkv3Tgz1KWi9buY
+9RdgqnEOIVpzpDbqU5jgdBXNkdRSMx5Wm0CBwjJqi9tjkvPwZcSfu1TntelwvoBn
+bp3U+n2CA795tnJ5foDf
+=Nyj6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.11.ebuild b/dev-python/django/django-1.4.11.ebuild
deleted file mode 100644
index fbf7e4c7afb3..000000000000
--- a/dev-python/django/django-1.4.11.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.11.ebuild,v 1.4 2014/05/03 01:57:47 idella4 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.6.4.ebuild b/dev-python/django/django-1.6.4.ebuild
deleted file mode 100644
index c3c98dd0fb5f..000000000000
--- a/dev-python/django/django-1.6.4.ebuild
+++ /dev/null
@@ -1,95 +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.4.ebuild,v 1.3 2014/05/13 02:56:58 idella4 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
-	# export PYTHONWARNINGS="d,i::ImportWarning"
-	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
-}
diff --git a/dev-python/django/files/django-1.3.1-djangodocs_extension.patch b/dev-python/django/files/django-1.3.1-djangodocs_extension.patch
deleted file mode 100644
index fa75c73fd2e8..000000000000
--- a/dev-python/django/files/django-1.3.1-djangodocs_extension.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://code.djangoproject.com/changeset/16223
-https://code.djangoproject.com/changeset/16231
-https://code.djangoproject.com/changeset/16952
-
---- docs/_ext/djangodocs.py
-+++ docs/_ext/djangodocs.py
-@@ -16,7 +16,7 @@
-         except ImportError:
-             json = None
- 
--from sphinx import addnodes, roles
-+from sphinx import addnodes, roles, __version__ as sphinx_ver
- from sphinx.builders.html import StandaloneHTMLBuilder
- from sphinx.writers.html import SmartyPantsHTMLTranslator
- from sphinx.util.console import bold
-@@ -127,26 +127,29 @@
- 
-     # Don't use border=1, which docutils does by default.
-     def visit_table(self, node):
-+        self._table_row_index = 0 # Needed by Sphinx
-         self.body.append(self.starttag(node, 'table', CLASS='docutils'))
- 
-     # <big>? Really?
-     def visit_desc_parameterlist(self, node):
-         self.body.append('(')
-         self.first_param = 1
-+        self.param_separator = node.child_text_separator
- 
-     def depart_desc_parameterlist(self, node):
-         self.body.append(')')
- 
--    #
--    # Don't apply smartypants to literal blocks
--    #
--    def visit_literal_block(self, node):
--        self.no_smarty += 1
--        SmartyPantsHTMLTranslator.visit_literal_block(self, node)
--
--    def depart_literal_block(self, node):
--        SmartyPantsHTMLTranslator.depart_literal_block(self, node)
--        self.no_smarty -= 1
-+    if sphinx_ver < '1.0.8':
-+        #
-+        # Don't apply smartypants to literal blocks
-+        #
-+        def visit_literal_block(self, node):
-+            self.no_smarty += 1
-+            SmartyPantsHTMLTranslator.visit_literal_block(self, node)
-+
-+        def depart_literal_block(self, node):
-+            SmartyPantsHTMLTranslator.depart_literal_block(self, node)
-+            self.no_smarty -= 1
- 
-     #
-     # Turn the "new in version" stuff (versionadded/versionchanged) into a