Version Bump, fixes CVE-2015-231{6,7} bug #543754

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 242 insertions, 20 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 01f36880bd94..061ba3110484 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.158 2015/03/09 16:26:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.159 2015/03/19 07:44:29 jlec Exp $
+
+*django-1.4.20 (19 Mar 2015)
+*django-1.6.11 (19 Mar 2015)
+*django-1.7.7 (19 Mar 2015)
+
+  19 Mar 2015; Justin Lecher <jlec@gentoo.org> +django-1.4.20.ebuild,
+  +django-1.6.11.ebuild, +django-1.7.7.ebuild, -django-1.7.6.ebuild:
+  Version Bump, fixes CVE-2015-231{6,7} bug #543754
 
 *django-1.7.6 (09 Mar 2015)
 
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 3ff467dc146d..8b3a60a703fd 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -11,32 +11,36 @@ AUX django-1.6.10-bashcomp.patch 1090 SHA256 1bf3b71b231a0ed772fc47c21d41e97f72c
 AUX django-1.6.10-test.patch 3955 SHA256 c27cf60632d0ea76b5e595d20ea6d8b6030c65b4461e9594b21e9e071cef23d8 SHA512 22e46dc5e48dacac609b3fa5161362691cafe2344393188983df08fd1e8f6b01ab02f3db35f3426b20621e0ea270da8a29a1fbbc2daf514b950062e7e9e36a2b WHIRLPOOL bd2add0207b9d783aaf1fc2629d0e963e0ddcd498acfbfa67565e067c8f32d6b591e5c6d660fd1d4fa984e43e260ad6d458eb2ec7d8c9d9fbb0f487c8d0a7f1f
 AUX django-1.7.6-bashcomp.patch 1090 SHA256 7097b55ef456d7bd228fc08ba7430b37b966170baafab521edcca5a1d2725556 SHA512 e7df516ea276eef06c79db2ec3694bbbbbe6724669281bc97311c9386f943f55bf65c4d41d07a4ecf2dc8abf11fddd0d07fc5a08f357365c67274c74280fc532 WHIRLPOOL 8a03ba9fd619acf6d1b041e84b26df436b594e952acea5c3cde7b62e83cbdc03ab75b28189b1bb49cba508e664976529d6e4403ceb475d0b36ecd70d948bc6b5
 DIST Django-1.4.19.tar.gz 7877522 SHA256 d75d605e574305e1c2864c392e1454963ead4552477ce14e67e64b9ef9faa1a6 SHA512 811267ec1ad99a8eaf4daa098cd5140970718f5814ed1e7e9ab706ff049c508a788cf186aafe208947e6350e17baef4a205f549bba744ef53c7e365a101a9391 WHIRLPOOL 67b24ddd89a31294cb260923b58e31dadfd6b4fe654a625586bc9341ba95f9bb2960befdd58dfae91128149fba1b95c3dcef9f72510e3e904cb03de8b685d63c
+DIST Django-1.4.20.tar.gz 7877794 SHA256 58ac719464c4c8b13d664ded6770450602528bf4c36f9fd5daabdae8d410ebb1 SHA512 b4625547af0a7d53fa00f801239858619015ba990b50cb859168814a2cc385c867ce570192e762ef1399518407958c687e607536259e420b238a5dd587d2d4bd WHIRLPOOL 8b6bd9912fd27c03d7d06df29314eeb4ad1efbc1347780d2414f324b83f7869bdd7e322b11eecfc32a7fb0189eedf37f69774157292b92163f3fa0e78f24417c
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
 DIST Django-1.6.10.tar.gz 6760152 SHA256 54eb59ce785401c7d1fdeed245efce597e90f811d6a20f6b5c6931c0049d63a6 SHA512 4ef44f2f4d0537443125765ab0e13b0d4798f828b09e7f881f2841d8e7078e4a8f0ac4750ebbd4586190feacd13490d4657575411737d2dc1e3c2cf046c2dadf WHIRLPOOL 8cbcfd690aa813b72da2f8480fcf66de87179a92a802450d354c1c383a7df415b3346d1a8a913a717b39db6edb67bcafd0fa0f45da55a2284e3e23c4fe45803f
-DIST Django-1.7.6.tar.gz 7601179 SHA256 b0f15e0ffe59a2f37cbaf53543f05d2f40c5a755390df03ec0655b5e4a8d4c90 SHA512 e3f198483ee2d1209abfffe6132ba93d1ef3c7e0b38685af6ed611667241116b2a3e6dc06ec8adfa19bf2dd5fe76d195bef6f914b8db231eaf7b38a6060852a8 WHIRLPOOL 977fa00c91166ea0151e2bac9c962b88e2c6a0f0e5a38f63c851995afb6539659614cbe094d1a2902ee382fed3083059ab23e00491193c8bbc34e5f83054f6f6
+DIST Django-1.6.11.tar.gz 6764000 SHA256 7e50e573e484435873b3515d7982d80093b2695aba17fd0ff024307454dc3a56 SHA512 de6024b49e0344bf153f73ec344180fb701e415e4f9c330118821744d0e579436cc265724f7ef7213c9551847022ba9570312633f317b9003db533d06deb9829 WHIRLPOOL 5de086952bda9449f85798e8fe3bac82f11e1b856c1d39e340399e71ca6bf183318eebf1f536714567036485637166a929082a1ba9d6c1816f07c53dcc12c72a
+DIST Django-1.7.7.tar.gz 7603286 SHA256 4816f892063569ca9a77584fa23cb4995c1b3b954ef875102a8219229cbd2e33 SHA512 e08446e7b6a0c64594dca2411b8b3fe16a8fe9b951bd33ae4c1f5187c83a2ce36bd7e0a07e169c338236d6f258362861e868a62f59d9d86bea679d9d42722ceb WHIRLPOOL bf38ff3730d20107e7f25d8793c7ce487edf66407f3c4dda906eca98eb6d8d9ff080338e20d2e418d82b217ef7611511be838a398737717bbad97fca6c8acc5e
 EBUILD django-1.4.19.ebuild 3230 SHA256 e2e6d4e1dddadf693e17bc55bad6533cac8d111c2f7d0927addd4e92bd18a0e9 SHA512 6b824d514f61a802ee150bfa4f73014afa268ff910d2e682e329fec24c89a59553c59bf02e584d5bd72713de2be7800cbdd559f9eff46b528f9a700a0c1fae4c WHIRLPOOL 9d7d72cd91e5fb7602bdc6c4e51c8e3c26adea764a96228d077e9a88b55b93c289ba7940b9339f41495a5bddfbe2073b545b5d0a4d8f1ccb3d70bc0343e6d373
+EBUILD django-1.4.20.ebuild 3210 SHA256 84a69b8622174f32f2b4a78c8472abd93f569a8d6b1074b4e1bf09e6fd26a9c3 SHA512 613dbd0bf8488217646b3c6bd8665c0b8c28280b9447930033121d0b95d7cdaa69c14bb96e7e0564a05ea053ed2fe9b9dcf093db6d0b2fe50acca290aec930a1 WHIRLPOOL 435f21330329a419185de41c01aca9773f7af74381645365284cf8fe3520a34d2f95989727c64281b5e232978af757df934978c4c4f5388ddac5db6282c7b5ee
 EBUILD django-1.5.10.ebuild 2570 SHA256 4516728575bf4f4386d18ff8b7b3dfc528988a2613314ed652cbaefaac85ee87 SHA512 81c02f0e126ba9c193bce65e06b51a903f927f1b313b34b789b48e6f70ee09bfee38821fe607597e240726fc5d5a9e47a50dd6d2c60ccdd2d22aef5c9da8207d WHIRLPOOL 9cd10f6cf0686cacbc1f74c22a3bbdd66aecb7db7484f392e2b643e322bfac65b34af4fbb631734ba8f62efdf5cb52f8841a56188f072fc3f808cfe5e2430c86
 EBUILD django-1.6.10.ebuild 3052 SHA256 6c6360d2bf31a0e0b38736060c85c4e06162ee320e3631bdd82dd610c35ca6dc SHA512 2e94c95c82623e7122c4ac732ed1f31c9598180e8b495b36bb9eb4d227c6cfad03b3d32da7b004eb8aa6bfa07bd2a6c22a4d3b4e8d8fc57cb75f4d5ff40a13db WHIRLPOOL 659e598cea13529d5e9a91658f07e3b906d0bf515a86cdd2ffdb6b1d935a5b68ac02ef2fff1e4e6bbeb5a38322cc98c8a511e5cca996294e0cf72ebc49ce2cbf
-EBUILD django-1.7.6.ebuild 3027 SHA256 9f0d3b811aa9b6063fd9e046770c900570e364378ee05fad5b15ce3fc11c1c74 SHA512 dba936e40687456969aa7450a2694c36b95b65bd86e7623ab56ecacd858c5bac787da0d2090826477d227fdee413b34e025cc4f2d5ec7a2f40640d2ae08441ea WHIRLPOOL 2265909bf279085df5f0ec66291e5434e8f49433e1f7a79ff70d8ff7f6a27e41ac8be87d736c5ae728f0ed880f52399ac51028410dc8547c04396c2d39c02810
+EBUILD django-1.6.11.ebuild 3031 SHA256 41206d4bf70e6106f74b2ae5705c9626d562103edd5596e0f8a74c44ddb8f282 SHA512 95d83accf0304790288a866c0434ccc5ec96e40cafc32a224e81a57bfdbef4a3cf2782635ec8df5794278b56f80e317558af4f4506e8bb35d91562c00efa180f WHIRLPOOL f7552d5028723c27d9c97a48ad62374cd7a96c79b2cc56dc6023c44e52306f1c0c936b4ab578dbc5ebd1868095054fa8406b431c093aab70fe623521800a99ff
+EBUILD django-1.7.7.ebuild 3034 SHA256 863736fff670c3d073f80423fbcd2b3633dfb8a852717fbd0eeb1feca1dbb52a SHA512 0f4b2afe4bd0985fd744598cb8484327a25d55091ed674d2edfa156861c395daadcb7f9170cb54c83c6a7c39fdd02153e6513aa6a10f38bfeca1537f1fc75ed8 WHIRLPOOL cf9adf5549bce0457bf66416409e180e6e85ad3f4ecb739d56549b074e21f8fff01cbddf0f0823e9ffd4fa60d1f1d75aad58e46ed6de1984f91b4094c6fc277e
 EBUILD django-9999.ebuild 2952 SHA256 3af5db49da1d0eb1d06b6813f0d6012a8ca840d3cb5ddfc1787ff843ac6f8bc9 SHA512 4a32d259578ae1e7a113ad898187e43d577528210bb7d8eb3224c844466d3df631e656110a2de374cdc6366ea447e0977cefa331c161306bda8a855ee878f0e6 WHIRLPOOL 16f2ee8ec70f5e6c91cc2dcd5f364a59ee321fe1c5ccedcfdd01ecc4e1911ed7e7517093c4aa86e18b7d6628ae6e6ae4653fcfcf06f331cf94a965cbcc745ec2
-MISC ChangeLog 25085 SHA256 9ca9c74031af989584ab6fd9589f151710502165c5b8723ee422a05926fc0235 SHA512 72eb59277f338d41b35caddbb38625853d258472e49041746caa3dd1b6391cd192c6f718facc14360b99831df57d735c56c6181c4ae1ab4dfcfe294e5e654d8c WHIRLPOOL ad140c29ca56a6165596bf28ea4ea93893c4904ae37df058b56d6fbd57c8dbb365902d67b41d7aac20641df5d06ef9cdfbf58a3e35dba162950170df824e0182
+MISC ChangeLog 25364 SHA256 f6cec115ead2b5a845489b1ddb2f1f9dee265090bf74030f11e48da2628fb44b SHA512 d22e7e30a5b8263a0e9fbfa2374ffea96286111acacb9f5942ff17d3888ca1aabdb1e87eda4e2a65730530d9aaed6cbdcada07264470740259bcf35bda7e8862 WHIRLPOOL c729113d4e69f4f5314cf26dc1c634f5652026eff134260f1060bf1b873c42b79d22831351fe29f93afc6657e563b947476d627209c86dc860973d9c23777888
 MISC metadata.xml 161 SHA256 54c4e6d783f2571466c7b03622195c255b95cf06209e59ab6653a6366cdfde6e SHA512 b306d222517e4eae525f6a79634f26eff2068f85911b7904c52c485a004d1d5401300808da67f9a1e3f102d65aebd1e0d21cd18145ea0bfec156f2aa3785b104 WHIRLPOOL f9c8e8d23bde25f4b14031f83dcc09e8437fdbcbb27199c1e9d8109fb2ccc7589cabf8240256dbbe6e080d04d2c444d115c66f82fc9b479e1e70d1ef0fe60fe2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU/cnCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJVCn5fXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0b0QAIWyCrgFGdpX/e/3E9aAOzg8
-/G+RBkSL18pTrl9Kl9o0q8rDsQlPZP4xFQ3Ptqc8b2vkTj5nerYSZzXMLM1TcBT1
-n+5A+stDJ3YnvfeEBCi1e2hHjd1XDnwlpIalTVHwGWLIIqybOIQZj8GKcs0tOv0V
-LXn0jLNwzxketbJxfQux55rAZh6/012E+aumr5kEVRg2MKM0ShHo0R4sEVuAhM/x
-1vxaCcSNt3VJIbTvw+mQ7rcnq/ByW7HIOFFQkV1ku7aSpgYCMRDHUEVJvD43X6d1
-rjOzx7CEatfOu4qLwEurVZFrPwGwAxMQGM4x3TqsERdZnM6UmJZatwmBb1yOQ266
-/4dC0CcWJ1IyDjzVgkHilbpIq3Ej4l4nhQU+4/X7Bg15GmdIL+bcpud9iOilDZnf
-x17TIXafjQFG2NiylUs4YJ9Sp4Ff8CYWF0zQqz8f42EvR3M12nrTFEh/dgFRngDE
-PMyM8kZVlzDoNXt5tr1JGuvJYqhS8NACrOJp260oJ3J8WktIiXwZmXjW/Rb3Sgsz
-KeJV9XUd690art12WJu1nljVdlYSrA3RpdUzDzODvEc5jd8qw+0m/AXEL7Q3YJPg
-c5wG1gRYylc19veGrDrITCMplonFXjNrym3xxMgU7W28l1DMkqqlsQqVnn0axmJN
-MCDv6CcvuvDvfpPAZmyA
-=wyqn
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirrn0P/3YMdoVzED2hVDk8v0rq2Ptg
+/ziTYb0RIJboHL+7n+t4aiFKkuVV5cWfu8+AhwE/6Kdanw5y0FTlXY5L5A7+1idJ
+tdblxO+/JY8zLPOr3aWCh079BJIomrIfGN5rc5wx+9VI2bo3TorUnxyRSw52G62I
+AmU5MiaShPy2Asrlm2e5q2BcftzORDTZVsRy41VMAVxRCJJ5S8HrvV2IvNkAzM51
+1MXyriHMXDQSJLM2eWqaAIIfuXOjjGwmcGK0EXISaStcvirGuBwDxcILlFjWw3WU
+10ixjCShRNWtjU9WC+ixZ4klBXCqn9zWN3klOjlNazocwaDUWdmrYLGuYsKYsSNH
+zaIRR3fRi3qyVvmwkvQGj69CHTbPqkL8c5+9COVF6peyFoj9Am+MKZBaCxtsUXsv
+wIBrPF318uB/6hATsoCzQz3ELtcIhnVYqnzl+9xDUsxv2xgb5aK1Uo+4RA1o5e8g
+kwHSiwl/G8XgB3gnp3rtYJYqFqdGtnPUyGBX60u0/yyXjISOlBGwwcDYMX5B7PjZ
+SAxykzW4n6fG+iBq2/DGK2j7ZN1m9LkPqnwl3qLOAu6aEgudq1PlvJ6jhAYWdPDt
+gjgoR7Jttg78lxqfUGq02JN9SHJ2ITItH661D6r4H0Lxcvoy6UR7LrE214TVrY3w
+Fn3pmqFU5YxGEj6uclNp
+=V4RW
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.20.ebuild b/dev-python/django/django-1.4.20.ebuild
new file mode 100644
index 000000000000..f539e258ca9b
--- /dev/null
+++ b/dev-python/django/django-1.4.20.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.4.20.ebuild,v 1.1 2015/03/19 07:44:29 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='sqlite?'
+
+inherit bash-completion-r1 distutils-r1 eutils 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="sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${PYTHON_DEPS//sqlite?/sqlite}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		virtual/python-imaging[${PYTHON_USEDEP}]
+		)"
+
+#		app-text/pytextile[${PYTHON_USEDEP}]
+#		dev-python/markdown[${PYTHON_USEDEP}]
+#		dev-python/selenium[${PYTHON_USEDEP}]
+#		dev-python/py-bcrypt[${PYTHON_USEDEP}]
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.19-bashcomp.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_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature "Memcached support" dev-python/python-memcached
+	optfeature "ImageField Support" virtual/python-imaging
+	echo ""
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	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"
+	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.11.ebuild b/dev-python/django/django-1.6.11.ebuild
new file mode 100644
index 000000000000..b85d78aa47d6
--- /dev/null
+++ b/dev-python/django/django-1.6.11.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.11.ebuild,v 1.1 2015/03/19 07:44:29 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
+
+inherit bash-completion-r1 distutils-r1 eutils 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 sqlite test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
+	test? (
+		${PYTHON_DEPS//sqlite?/sqlite}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		<dev-python/numpy-1.9[$(python_gen_usedep 'python*')]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		)"
+
+#		dev-python/bcrypt[${PYTHON_USEDEP}]
+#		dev-python/selenium[${PYTHON_USEDEP}]
+
+S="${WORKDIR}/${MY_P}"
+
+WEBAPP_MANUAL_SLOT="yes"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5-py3tests.patch
+	"${FILESDIR}"/${PN}-1.6-objects.patch
+	"${FILESDIR}"/${PN}-1.6.10-bashcomp.patch
+)
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+python_prepare_all() {
+	# Disable tests requiring network connection.
+	sed \
+		-e "s:test_sensitive_cookie_not_cached:_&:g" \
+		-i tests/cache/tests.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 -v2 \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+	webapp_src_install
+
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
+	optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysql-connector-python
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature "Memcached support" dev-python/python-memcached
+	optfeature "ImageField Support" virtual/python-imaging
+	echo ""
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	if use doc; then
+		rm -fr docs/_build/html/_sources || die
+		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.7.6.ebuild b/dev-python/django/django-1.7.7.ebuild
index 020437b758d0..a384599eccc5 100644
--- a/dev-python/django/django-1.7.6.ebuild
+++ b/dev-python/django/django-1.7.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.6.ebuild,v 1.1 2015/03/09 16:26:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.7.ebuild,v 1.1 2015/03/19 07:44:29 jlec Exp $
 
 EAPI=5
 
@@ -44,7 +44,7 @@ S="${WORKDIR}/${MY_P}"
 WEBAPP_MANUAL_SLOT="yes"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-bashcomp.patch
+	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
 )
 
 pkg_setup() {