Drop vulnerable version, bug #554864

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

9 files changed, 25 insertions, 575 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index 1d024e82ac4c..dfa5d0b01d46 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,12 @@
 # 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.175 2015/07/28 10:22:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.176 2015/07/28 14:33:05 jlec Exp $
+
+  28 Jul 2015; Justin Lecher <jlec@gentoo.org> -django-1.4.20.ebuild,
+  -django-1.7.7.ebuild, -django-1.7.8.ebuild, -django-1.8.2.ebuild,
+  -files/django-1.4.19-test.patch, -files/django-1.5-objects.patch,
+  -files/django-1.6.10-test.patch:
+  Drop vulnerable version, bug #554864
 
   28 Jul 2015; Agostino Sarubbo <ago@gentoo.org> django-1.4.21.ebuild,
   django-1.7.9.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5eb5d7dca2a4..55b0316e669c 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,50 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX django-1.4.19-bashcomp.patch 1124 SHA256 08fa240a2991b7b89926ed14dc9a50992a5ca0e1b44f932d27d8ec7c68db4f2b SHA512 b1c2382f202dcf290cb8996ea174a1539783478fbf2feab18433f0cedc6c9dd0e088b3241131dc0fb1a5c621a45003ccb62146591ccac42218dbe38cf56f53d4 WHIRLPOOL a6805c97326853bf30f5c00906d13222532744cf07a182efc7bd0fecfb13a0076156517c1c31e88c4d44482a0db36ae3d666ac880fb4cdbdd78bfe93f1a84474
-AUX django-1.4.19-test.patch 469 SHA256 e0631931a8aa42434963944976a5c8505a259f7aa5884be1842100ca32f8be15 SHA512 3a7f8dd24a0cbfeab6e9c04e5079538c2058e677f46bad05324cdfd2fb644585e917d92389e8dabce410c3e8e97a390ede04c217d9eca32440b942bf32c91706 WHIRLPOOL e007c8379e7c64308ab40847bf92bba275cd6644f3e1d9fabefafe710536b9082a3c30961d2619fcb36be75b3a5daa8133537aaeaf41fe180d76337aac650b32
-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
 AUX django-1.6.10-bashcomp.patch 1090 SHA256 1bf3b71b231a0ed772fc47c21d41e97f72c0ba6e5a7108a851087be4bc35e7e4 SHA512 43e6a0a23d713dfb2b002ee89f68fc8cfe5f18bbfb84e9addd37ca0aa25aaa704238833c9be781da0b71fe708fbe2831ef61952638874fd3b6d10298d9076118 WHIRLPOOL d1ff83d8919b957df1491ef17d27f828ceb708cef07d483c7549fbf2106dcfb3f66178ab2a7a248bddc70814a130ca5e583e86f2f7e477f93547f1796d984548
-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.20.tar.gz 7877794 SHA256 58ac719464c4c8b13d664ded6770450602528bf4c36f9fd5daabdae8d410ebb1 SHA512 b4625547af0a7d53fa00f801239858619015ba990b50cb859168814a2cc385c867ce570192e762ef1399518407958c687e607536259e420b238a5dd587d2d4bd WHIRLPOOL 8b6bd9912fd27c03d7d06df29314eeb4ad1efbc1347780d2414f324b83f7869bdd7e322b11eecfc32a7fb0189eedf37f69774157292b92163f3fa0e78f24417c
 DIST Django-1.4.21.tar.gz 7878015 SHA256 934f1975218680d51c4da9d63a39bc5fb1ddaac48476fd34b9ab7903fd98bcf4 SHA512 25fca8362fa30822a5993a2f1d00bc7629b97acfac97daa406fc7658019e35f52ecc539cc875a8ece3b1edb140fd5260e8dd3a355c9405b693d191746df516fa WHIRLPOOL 50fdcd0129cbd23e0400b15b3da069318a731643f5817a8bc98872f9c402b2f23171a13eb031732c0753855440c357b0a54c155fdc0b7bc71761d40f2848acab
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
 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
-DIST Django-1.7.8.tar.gz 7604685 SHA256 f0ab12c7c88a033681e44e2e4bf4a93d93c85d5b1e8e9c875b4b917abb246921 SHA512 8eaaf3fc743971341d375566b70ff95eab399388a7ee03057f48e4bfedccd9b32e7a69b0e9ab2197dd47ef76106099a47eb6762bb01e47044543a77b447892b5 WHIRLPOOL 56b7eb4cb84dcde4e876893e04f8dfccc16020c5ca83e638b7f8fcfbde39813d96d9471998db533d4daf2fbdbfd2af67bcfc371b944d06a66386401000bb0044
 DIST Django-1.7.9.tar.gz 7605194 SHA256 4f3f9fe4e5d20ff8ed6a90b5d2f2df2d8fc054e478cdcc3db81c6b29bd217860 SHA512 349f6950ec7cb37c8ae44a5fc9b924ef0d02e244c834a65bbdbe84d8a993474c6e94f82ac0df5bd08594c8cc6f72bf9413b7b30091319dbb5c018f211d3e9e67 WHIRLPOOL 977e011027f4783aab9cbf53cf6015dc705f63f6b442bc403ede76562822fb0c09027fd89fe776455f1e3d55e636db4f6b586130ad41a709aafbe9eac003870a
-DIST Django-1.8.2.tar.gz 7275112 SHA256 3bb60536b2fb2084612fc9486634295e7208790029081842524916b5a66d206f SHA512 845cb2502d023ac512cd29868d5d52957a304867e8e29f9fd83762a247e94ab98f418435baca0766f76bb9eb5966d2c5a5786aaf697a21d029ad77f6dbee8215 WHIRLPOOL 50c37d507589c64093b92d1ee9e0bbfd8ab3ee15efa9a6eaef5a8def1f0a44d161208ba752c5e3f337dd63547a2c62a587cf5ef29f9d7c62f81ccbb4be8f0ce1
 DIST Django-1.8.3.tar.gz 7284327 SHA256 2bb654fcc05fd53017c88caf2bc38b5c5ea23c91f8ac7f0a28b290daf2305bba SHA512 17943c4769bb11125ee23cee6e05ce120a769ff46b9b380219bb28a42d4119082c2041fbc826d59707cb9f2cd1dc19c94beb61ac644e8c4fa5ba3bd528efa06e WHIRLPOOL 2f0cb1df6f2029be61a9a350dc2d5a955d91652038f9c94e3e8717bfc7824e98486c6cbe3c4494bbbe451b82eb75d4ce00828c7b8f6d207cc22af6c65d565317
-EBUILD django-1.4.20.ebuild 3207 SHA256 d6cca178b5a178f9e5e6b107340f50ae29f60cd0d53f84ebec83ce6c5d5ca917 SHA512 ff475cee1ae71628e3fa2c62b9da99141de4538550262ef86af5adb29150fda64b6e6b9e8e37782a2949ff5efd4a40aad8337ce26697e92ed101c29a18ceda13 WHIRLPOOL 0570c5336747088e7ff64dcb3678892d446759911876934a5d73856fa2db859a27b84909a24e84711a63f8cc0a25bb30c61508da52fb6eca94da8834a5349475
 EBUILD django-1.4.21.ebuild 3207 SHA256 5bf97f5fce88ffccd3ae4e76acbf3d6f09957d98c95571d1141b6dd8ac1e754a SHA512 8a938e5777c83828a8ab0ab04517aba144cffe35c3f3ce4a5b413275d409fbd8c754957a5c059aaa1602806510b57af2a3fee9334154fbabdf36fdb443ad7809 WHIRLPOOL bf0f0dc8640c89ce036001d168af48b1757eacbaf69fef3fe01628aab6c51252023a6f957747061111b246568646af2390bed0e65330fcaf24aa8bb3b0d259b4
 EBUILD django-1.5.10.ebuild 2569 SHA256 0550f2303a92e8b4b9b31cadc4b70d62e3ddd9ea9ce218616b934c81de67661d SHA512 0ba4474b79a0f4925f5515e220922059344272fe2f7b29925715da276288b347b8225026fb526b02b3343d28b95b1e602279a26fb5ec593a346e82ad2bbf18ff WHIRLPOOL c84571632953207d3791a26638acc181a675d2a0ec9f7c93b511ad010797be162707279eebf7c6347cc77e0a7027eb0fddf02adc69ed50c6e9db536532667eac
 EBUILD django-1.6.11.ebuild 3028 SHA256 882cb26062244da01d0be070d50df2b0f231825197e0bd13c30dac3dbf0b3204 SHA512 b5c2fda60ea16a6b63a0e51d30738f7d22aa33850ec6b7ed5331a423646454df0408c1f4d941c12f6dedca55b7c7eb55b71540b1eea3af4300bcb645f98d066f WHIRLPOOL f72e7d9c79c30c01667351f889b4d3e2f560b156cb87f98695e81b7d720b5244b416505c69c76f9424bc5d16d1d44747f5fe43648490742b1307eeaabfba54fa
-EBUILD django-1.7.7.ebuild 3033 SHA256 062e69c031be3076e61f4affa4527443c4699d8c8fe0b1dcf7fe9fd47f200b21 SHA512 d71580e958aafb6456e877427618ef73f3d0f0bc1b7a4444cfe592115d6e780159b0b1a4a35c0d3b8a057e1311308b066f519f84dd639759c54659681020d999 WHIRLPOOL a7cdac5eb4f8f3f44092ef44319ea587d73bb586eca751f6ead1a25e77134c190f779e511133bc056cd181db1d53914c1111052720ae556a8a37191b256abdad
-EBUILD django-1.7.8.ebuild 3035 SHA256 438935bc1db89855c32755f501acd14d438e0bd84ffb63d0d76e0baa10e8cc8e SHA512 1c0d216b98561eca3abc71ba3c7ed4e53fc77640c490ccfc1fab9b1bd988ae943cb1f87fef43eb465b6bcef520e7fb77b1ee5241c81f9aead30fc7cbba2496d8 WHIRLPOOL 7a3af6552770005a3ae4242c0ce2ded4d070cee8471ac19a8507a77494d25f6ab21bc63a987d23c11929d10f10150223df6c1bf8c65d6a9c26f43123609ff6c6
 EBUILD django-1.7.9.ebuild 3032 SHA256 770e5a972ccc4950a67e30a0f7d37405fefa262eae3004f8a5d6b0caf1be26de SHA512 8afda3f23380c339f2612cf7ce840def66b08454e22c54e86191f5fa24c5675b5088de20beb5bb479d03ab9daebeec16ffcbaf181d16c437f2cef7213b95d7bc WHIRLPOOL 8673a2ab3fb1f6ab5b1f482155c5c0634a9255971bcdffc6eb242ce7949cc94c5849ac432d110c29b3658d18223509d50e1fb25dfbd6b95713ffbebba402a123
-EBUILD django-1.8.2.ebuild 3124 SHA256 e5fda81c7c63ffa3abf8d3b5ded01890496328857abefdbe80d603a0544f8e54 SHA512 0182a2df6578eb1ecd46aad12a3270c463013eb018fa2805f2646af62f377b91c23b9910bc2a68d3ba026188d75be586ae27249ea00aee92b677ef8ed519573d WHIRLPOOL f919d19217b0f71b360ec1aeaa03e7465a6ef963bc835ffbe7548010b67277bfe518f8c28e9bda1d952f29f47183b927932468c9c1a7176358a53a8e3ca679ab
 EBUILD django-1.8.3.ebuild 3127 SHA256 a6565935e4bce876106e55f51a26a37ed4c9b67f85c4f3e0e4a1344a679aa33c SHA512 00431d51ca4e027d17f31fe76ecd163fdec2ea4a167f74db12ff2f416bb63b058e6df608b565c4b889c849044c21940375354df7545a44bd27edf872985edf74 WHIRLPOOL 9583f4e8ad1ee5db4cda1372d6da971a43f7f77fcf9d8a59d5d7e9f37e1b7956c2fc6a8671c34b2af3ac0e92660dfa84f587213f98a418b5cac7a9f600ff933b
 EBUILD django-9999.ebuild 2875 SHA256 1967a3bc91a89f9e7d891ecbc2be1e1c34d832f7a7da7185394e386f624a02e6 SHA512 0fd5c630d6ac658c9eca29b269b1044bf37a728bea8184ae3aee2125c8b6c26b2be38b64bc9b39a5416997f1f25d9d11308b7f8f1e38f1f36c86323c195536eb WHIRLPOOL 01e5c0427b14a963fc4be730afccad404542e668efe141ad941864c1143361a3d8755269d091b23c5617fb7f928c1dcd7f25a7ad318f782671a0b6d0b94e7ec3
-MISC ChangeLog 27477 SHA256 ad83e8d684ee1ad8e4ebed7fc2958e4ca2641ec37ed7289a44640b8af4c41c96 SHA512 565030c58c17b8274654a0e2749703c1faf9dfd0ffb63e3751123d471aca5dadea43b450a1ef8e15395c3858b33ae51c5183d3560a3e4e14cdea0e4ead7ce0f5 WHIRLPOOL 0d41768d162b9cbf257a0d51f0fbaa52f79a7e10840b008301d64185ff90c68ea5180041600f872ee539e2e0f7ccdf437238a3469be75864b2fe01dc467fdb66
+MISC ChangeLog 27759 SHA256 79ae77859ed419bd3841ea949154d3e49607e91ad3c346c5756fb199b4dc6557 SHA512 7ff4ec9160658c924c86d858ad47e83e25edfe10a0251d336e67ea7449bd7ec35286ccf4a767bb079ab9b9de45c6b0f73c59308ca1a51150f0cecc49d16b2510 WHIRLPOOL 1adf6d85ae7d453c85c659b83bdfe39dc6fd7373e730e9865efbef43a4c5619b8f9d77cebf0a817dbaa793c189b170c3db5194067d8efc65a757938d88b2c709
 MISC metadata.xml 234 SHA256 e8ce5759e151fd1ac5a81df1d26a27c770ea6d2371e575545338f4ba7d2b47dd SHA512 e4d17555358b36f685a6be7063b31a1e623b3e53f394ebac4fcf23c845ed01c6e559286d1171087768afc9fb48ba1574f35180281e0902a341746027075d7689 WHIRLPOOL 34fdc28d5713508d8835c0c86ff40f51a7f20e580bc238c3ac1936977e18e5d2de1debee43491a96043834b1af19ca42888ded0d08a2df5ab609944c9ef4d2a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVt1fzAAoJELp701BxlEWfcmYP/1tbmahxIUz57RCAwlmJ/Rfu
-vL9LLfCdGwAg6kJXDP9rn7RknpK0OcM3kCWniqRsfJfsixLbB9nJpenDqr7Yloh/
-RB/owHz8Vyq4Tmz0UKHmfZgXYZIGggYvRNP/S8aSROzMdrD/nDcT6XwaTzjqu9KN
-ML0qNZUfm0NS/atfsRFLtlDbCDJWfGmafaf3QLMXN4WfZoEIdhOFKrl5m+RVPJVK
-wHOTwZ1wRkM6ZirTenoG0jr3z3S0N0V6xfOvVYE213OxOR9ozmEnB9Xq9UjGhqm6
-FWOD59QSi5IpR7jQT0c4UNotXoRwQP6fBSL8ATholBEVTQqvompzqRbn2xfIzjuZ
-35Ezp3KEXGE+tbhTND1aiZnZPjwmykcZV6hC/M0hRytTrr3JxSBi6Q2N7OSbkM01
-89LJuy4YPAJ1lz/PVepuARSLwBHmjhiylcB7cZgfn8hVbgqA9feGBdFIH/OLdzjQ
-YHJbrw9YhoE7w2m5ncH1V9tSqj1g7DFeEddqzPp9kAzZVhZIajLEO/sBD0dYBe8t
-zBcEi5DjXHf/INSHn4lgs3MjrfoY/Z+5+IoIBD8iYfFqIrEVusvQinA9rj+PyWkX
-O5uZD7SacJSeUn6j47CEf89ySLW0vmzU9aUcyaDyb80YlLQ2XF3J+ZZmAZp1+jjC
-+tgz94mdZLdsY0vr+d0+
-=jm+Q
+iQJ8BAEBCgBmBQJVt5KcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmi3G0QAI8LZrsyup4HsHvZXLNcTRat
+wN9Qgs2kOfzI4dXv4Rz4yw+fDr5E2RCmGVb2PJOKoLmcaoRWmRk9Nv5O8iHJy0M0
+ILO0odgbkJi247bb+0Y7j71DJL4akIZpTMqOBx+jKEbLPjQdg+WCLfHN8RGwJuxE
+SmkvsKeupke8lkMYhVB5spnkjbAm1kTg662J6G4L1T1wneH5NdPZz2xh6nvzXAue
+SguXQnJgM7t1vj32bLEB3EvqU8UD+XI9jco8j9ytkeQb7AkEnfXJIpxEn6wF5DwE
+Felv59X7l35QNggal3Mw8V7d136mIlFlLCo9TIAvoMGp/etGYLyR1N69vanLAJFI
+O754n9j4miohoeeCeYcatXvH237BqvbkRr7vMSSclgEPkbB3sLJiWEUVqnIpjfF1
+PCM9Oah+ymLugyGJlv0PCJrPjk5lIjgGEBVyQbTHlqWyB1Be3AQCspG2DSHDnhAU
++gMgiIJKiF8nagGkKBvBTIJ+8yA4HFibsv0z1LDTaPCiUE3feKwAud3jZt0Fx5kn
+7HTKd9NHlxIixaacN0IfOUDstnRF833AqmEMJ/7JYZM1DZ9nmkxNouINBq3mJRTE
+RmRgg71LcBfjX/T+KuVm+FYLp+4J6n8ecgnKSTMsPRHWabB7kNf+hXpXAP6HevIu
+xjEWQ/j94aQHkNqYF8QO
+=03LN
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.20.ebuild b/dev-python/django/django-1.4.20.ebuild
deleted file mode 100644
index be8ed3115d60..000000000000
--- a/dev-python/django/django-1.4.20.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# 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.3 2015/03/24 09:12:33 ago 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.7.7.ebuild b/dev-python/django/django-1.7.7.ebuild
deleted file mode 100644
index 0186e771e7de..000000000000
--- a/dev-python/django/django-1.7.7.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.7.ebuild,v 1.4 2015/04/20 20:36:15 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[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-#		dev-python/python-sqlparse[${PYTHON_USEDEP}]
-#		dev-python/bcrypt[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		sci-libs/gdal[geos,${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.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/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	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.8.ebuild b/dev-python/django/django-1.7.8.ebuild
deleted file mode 100644
index 5d02b45a8c7f..000000000000
--- a/dev-python/django/django-1.7.8.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# 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.8.ebuild,v 1.1 2015/05/05 17:26:36 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[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-#		dev-python/python-sqlparse[${PYTHON_USEDEP}]
-#		dev-python/bcrypt[${PYTHON_USEDEP}]
-#		dev-python/selenium[${PYTHON_USEDEP}]
-#		sci-libs/gdal[geos,${PYTHON_USEDEP}]
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.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/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	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.8.2.ebuild b/dev-python/django/django-1.8.2.ebuild
deleted file mode 100644
index bed3f46162eb..000000000000
--- a/dev-python/django/django-1.8.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.8.2.ebuild,v 1.1 2015/05/20 19:59:14 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_PN="Django"
-MY_P="${MY_PN}-${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
-	mirror://pypi/${MY_PN:0:1}/${MY_PN}/${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[$(python_gen_usedep 'python*')]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-python_prepare_all() {
-	# Prevent d'loading in the doc build
-	sed -e '/^    "sphinx.ext.intersphinx",/d' -i docs/conf.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}"
-}
-
-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
-}
-
-src_install() {
-	distutils-r1_src_install
-	webapp_src_install
-}
-
-pkg_postinst() {
-	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/mysqlclient
-	optfeature "PostgreSQL backend support" dev-python/psycopg:2
-	echo ""
-	elog "Other features can be enhanced by"
-	optfeature "GEO Django" sci-libs/gdal[geos]
-	optfeature "Memcached support" dev-python/python-memcached
-	optfeature "ImageField Support" virtual/python-imaging
-	optfeature "Password encryption" dev-python/bcrypt
-	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
-	echo ""
-	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.4.19-test.patch b/dev-python/django/files/django-1.4.19-test.patch
deleted file mode 100644
index 3fc4b09c3357..000000000000
--- a/dev-python/django/files/django-1.4.19-test.patch
+++ /dev/null
@@ -1,14 +0,0 @@
- tests/regressiontests/utils/jslex.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/regressiontests/utils/jslex.py b/tests/regressiontests/utils/jslex.py
-index 7cd93ca..24317ff 100644
---- a/tests/regressiontests/utils/jslex.py
-+++ b/tests/regressiontests/utils/jslex.py
-@@ -1,5 +1,5 @@
-+# -*- coding: utf-8 -*-
- """Tests for jslex."""
--# encoding: utf-8
- # originally from https://bitbucket.org/ned/jslex
- 
- from django.test import TestCase
diff --git a/dev-python/django/files/django-1.5-objects.patch b/dev-python/django/files/django-1.5-objects.patch
deleted file mode 100644
index fcfd3254f701..000000000000
--- a/dev-python/django/files/django-1.5-objects.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Remove un-needed objects.inv files from d'loading during doc build
-diff -ur Django-1.5.1.orig/docs/conf.py Django-1.5.1/docs/conf.py
---- docs/conf.py	2013-03-29 04:10:14.000000000 +0800
-+++ docs/conf.py	2013-05-28 01:54:49.695008477 +0800
-@@ -91,12 +91,6 @@
- 
- # Links to Python's docs should reference the most recent version of the 2.x
- # branch, which is located at this URL.
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/2.7', None),
--    'sphinx': ('http://sphinx.pocoo.org/', None),
--    'six': ('http://packages.python.org/six/', None),
--    'simplejson': ('http://simplejson.readthedocs.org/en/latest/', None),
--}
- 
- # Python's docs don't change every week.
- intersphinx_cache_limit = 90 # days
-# Fix creation of html docs on python 3
-# https://github.com/django/django/commit/a5733fcd7be7adb8b236825beff4ccda19900f9e
-diff -ur Django-1.5.1.orig/docs/_ext/djangodocs.py Django-1.5.1/docs/_ext/djangodocs.py
---- docs/_ext/djangodocs.py	2013-03-29 04:07:21.000000000 +0800
-+++ docs/_ext/djangodocs.py	2013-05-28 02:34:59.057009144 +0800
-@@ -204,7 +204,7 @@
-                         if t == "templatefilter" and l == "ref/templates/builtins"],
-         }
-         outfilename = os.path.join(self.outdir, "templatebuiltins.js")
--        with open(outfilename, 'wb') as fp:
-+        with open(outfilename, 'w') as fp:
-             fp.write('var django_template_builtins = ')
-             json.dump(templatebuiltins, fp)
-             fp.write(';\n')
diff --git a/dev-python/django/files/django-1.6.10-test.patch b/dev-python/django/files/django-1.6.10-test.patch
deleted file mode 100644
index abc39ffbca2b..000000000000
--- a/dev-python/django/files/django-1.6.10-test.patch
+++ /dev/null
@@ -1,81 +0,0 @@
- django/core/management/commands/makemessages.py |  4 ++--
- tests/i18n/commands/extraction.py               | 14 +++++++++++---
- tests/utils_tests/test_jslex.py                 |  2 +-
- 3 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/django/core/management/commands/makemessages.py b/django/core/management/commands/makemessages.py
-index 5b09661..c8f05ac 100644
---- a/django/core/management/commands/makemessages.py
-+++ b/django/core/management/commands/makemessages.py
-@@ -90,7 +90,7 @@ class TranslatableFile(object):
-             orig_file = os.path.join(self.dirpath, self.file)
-             is_templatized = file_ext in command.extensions
-             if is_templatized:
--                with open(orig_file, "rU") as fp:
-+                with open(orig_file, "r") as fp:
-                     src_data = fp.read()
-                 thefile = '%s.py' % self.file
-                 content = templatize(src_data, orig_file[2:])
-@@ -404,7 +404,7 @@ class Command(NoArgsCommand):
-         for domain in domains:
-             django_po = os.path.join(django_dir, 'conf', 'locale', locale, 'LC_MESSAGES', '%s.po' % domain)
-             if os.path.exists(django_po):
--                with io.open(django_po, 'rU', encoding='utf-8') as fp:
-+                with io.open(django_po, 'r', encoding='utf-8') as fp:
-                     m = plural_forms_re.search(fp.read())
-                 if m:
-                     plural_form_line = force_str(m.group('value'))
-diff --git a/tests/i18n/commands/extraction.py b/tests/i18n/commands/extraction.py
-index e0b6deb..06cf50d 100644
---- a/tests/i18n/commands/extraction.py
-+++ b/tests/i18n/commands/extraction.py
-@@ -5,6 +5,7 @@ import io
- import os
- import re
- import shutil
-+import sys
- import warnings
- 
- from django.core import management
-@@ -141,6 +142,10 @@ class BasicExtractorTests(ExtractorTests):
-         self.assertIn("UnicodeDecodeError: skipped file not_utf8.txt in .",
-                       force_text(stdout.getvalue()))
- 
-+    # This issue is fixed in 1.8+ (#23312).
-+    if six.PY3 and sys.platform.startswith('win'):
-+        test_unicode_decode_error = expectedFailure(test_unicode_decode_error)
-+
-     def test_extraction_warning(self):
-         """test xgettext warning about multiple bare interpolation placeholders"""
-         os.chdir(self.test_dir)
-@@ -206,13 +211,16 @@ class BasicExtractorTests(ExtractorTests):
-             self.assertEqual(len(ws), 3)
-             for w in ws:
-                 self.assertTrue(issubclass(w.category, TranslatorCommentWarning))
--            six.assertRegex(self, str(ws[0].message),
-+            six.assertRegex(
-+                self, str(ws[0].message),
-                 r"The translator-targeted comment 'Translators: ignored i18n comment #1' \(file templates[/\\]comments.thtml, line 4\) was ignored, because it wasn't the last item on the line\."
-             )
--            six.assertRegex(self, str(ws[1].message),
-+            six.assertRegex(
-+                self, str(ws[1].message),
-                 r"The translator-targeted comment 'Translators: ignored i18n comment #3' \(file templates[/\\]comments.thtml, line 6\) was ignored, because it wasn't the last item on the line\."
-             )
--            six.assertRegex(self, str(ws[2].message),
-+            six.assertRegex(
-+                self, str(ws[2].message),
-                 r"The translator-targeted comment 'Translators: ignored i18n comment #4' \(file templates[/\\]comments.thtml, line 8\) was ignored, because it wasn't the last item on the line\."
-             )
-         # Now test .po file contents
-diff --git a/tests/utils_tests/test_jslex.py b/tests/utils_tests/test_jslex.py
-index a2af7b4..e696149 100644
---- a/tests/utils_tests/test_jslex.py
-+++ b/tests/utils_tests/test_jslex.py
-@@ -1,5 +1,5 @@
-+# -*- coding: utf-8 -*-
- """Tests for jslex."""
--# encoding: utf-8
- # originally from https://bitbucket.org/ned/jslex
- 
- from django.test import TestCase