syntax fix, drop vulnerable versions wrt Bug #521324

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

7 files changed, 16 insertions, 277 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index d027b1039323..6a80b695f1ab 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,11 @@
 # 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.146 2014/09/14 11:26:44 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.147 2014/09/17 13:02:10 idella4 Exp $
+
+  17 Sep 2014; Ian Delaney <idella4@gentoo.org> -django-1.4.14.ebuild,
+  -django-1.5.9.ebuild, -django-1.6.6.ebuild, django-1.6.7.ebuild,
+  django-1.7.ebuild:
+  syntax fix, drop vulnerable versions wrt Bug #521324
 
   14 Sep 2014; Ian Delaney <idella4@gentoo.org> -files/1.7-test_serialize.patch:
   remove redundant upstream patch
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 920ba6f2fca3..e2226f98706a 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -5,27 +5,21 @@ 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.14.tar.gz 7754876 SHA256 81edad81211fd515677a35ab2d40833557649dd650f150baf8416f416b8a6c9c SHA512 b7e2e57d15bc5eee62aa0425932c99928cceb3f4bfdc28de42a96ee9ba2bdc0c28e7e102846e7ea3735eaaa00944b7aaeb0bd8625216dee2fc406f0be2601892 WHIRLPOOL 02689da58ab0d70a8f8e0f388a6f8ca9e25091fef0fce0ade0cada9072906bb7a4dc0d81728c9f0509a0c45b55e93e66bae8a85c6356ef66ddb911b3895e9546
 DIST Django-1.4.15.tar.gz 7754429 SHA256 aa57ceb345091c25648b41c98a6f46fffd7884695fa884c7039291177ded14e9 SHA512 6552173269b5c86b3ee20e31d70bd1e0b5c8dc21ee82af0ce3b75f374d2a9adbe3ec28cf39c44156782ae9a0cc64aeac80a938f6d3efbf29d4affe3f0354348c WHIRLPOOL cb19b9e1e17ec60e5db06a40b78681a43714b40e2caad6d87cc3f150d123826552a289d96a35c72b9596fec1279714d26b2f9950a7d75ecb72c3f068134564c6
 DIST Django-1.5.10.tar.gz 8074324 SHA256 7cb4217e740f7d5d6d74617dbb9d960f9c09e8269c6762fe68c6e762219f4018 SHA512 5357116870370f7fd06f77e5bfad98f89c6bb131eb2828ded524422d0690d8842c3106e4e92614c374ab2549d205e77c98e4071894f0625dfe69a382171b1834 WHIRLPOOL e603767d6912e9bffd65161750baa626c315362c8c438a2c6fb25a47ecdc867bace998752a9acb6b8db1833f30e8bd7b9aa8fc87f823b906b394d4ab455aa265
-DIST Django-1.5.9.tar.gz 8074400 SHA256 47ce505c5046c38817828bee253b7256872f86c4340db1af698cb8548dbaa0d2 SHA512 0b42f09a6bd28b18eaaf6b1788fcc620ee410442c4f179130babed3fa6763155cc5469e1b38d68a87742a21f34e0ac343167dd7a9de0595c81e81a25296a1087 WHIRLPOOL 817e88b2a82b48d6c7f2f78091f66b786227b5513be01f99c90a5ab36920e5d15167dc209e9954641d61536e62e396719224fbd4b5812e349ccf59e48ff1d72b
-DIST Django-1.6.6.tar.gz 6645456 SHA256 536cbd54e533ba3563d205f0c91988b24e7d74b8b253d7825e42214b50ba7e90 SHA512 4d52ed7e31df7d1b449697e5ecd48a94cbb365a1f0abe6b9308ba815b1ef80d2c38d8ba07a57f928617a592afaa44d48374ecf3901b66e68d389fc4ac4f6891d WHIRLPOOL db69860de31c2283faab0931818d215dab12cb36ed1f8b3160d0e1b5ed49c72b66b751b086cd454acde76c5c1b003ca89fabbdf88603de7b4cacf5df4385d3e0
 DIST Django-1.6.7.tar.gz 6647301 SHA256 9a64211c96a3262bb2545acc82af5d8f3da0175299f7c7e901e4ed455be965fb SHA512 7806562853c1c2db1decc597ec62f1e91689a6a3668030ed8dc0a757e5bf1603f4be945cef277ce564d26665a39d5c4151060b7889822e66671345d973dd256d WHIRLPOOL 6cbac5dbea4a37e88beeec3402ce264fdc889fcc6ec319fdc7436b45a538ad9a4ccb4fc01bf4c122407700e7cf6f8223bd40aa94af16bfa801dc93aa46576484
 DIST Django-1.7.tar.gz 7486550 SHA256 33f781f17f145f79ee8e0b8d753498e0e0188f0b53b2accad4045d623422d5e1 SHA512 9eb96812b913372f2e95e70fb498109d42d74a7df2a8b26083c5b372b421d897ef4119f45bfeb1cf2ef224448e9e0cfb801842441454b9b16c524e94d80d509a WHIRLPOOL a462e153501e572ef00c4319165b953ab3658d2bf1250eae05b75b8ff3ade0621b1a58943ac1fee4441c239cb3384e2ee73764c8255090a7a419675d09c19260
-EBUILD django-1.4.14.ebuild 2557 SHA256 c9b15a402c64e4faca76c8fbf6dfce82337dc182ca7ce153e546b95e91eea17f SHA512 ddf443a02963a5ad6decfa2695bfdb824ab1b107adddff2fb6f063de7b3a0ec16c837792a180da47b89ab3a2237ec58423eba68a53de3bf7bd92e04187fdbdaf WHIRLPOOL a7c53d1deeace93ec1f7ce9450c50ca2add66b64842f19121c25610d9909de69c40cf8f40294fbb892da8a0c658709d09e1a183438767d4252cd391c329dc63a
 EBUILD django-1.4.15.ebuild 2557 SHA256 7248e0267a58f4b5a35fe2d7d4b164750921f0bccc2260bc572c23dc0a8894c2 SHA512 58380a2443d8966ff78616ff4a90645cca4cf0e1cf672077b928542931b96230caa85dbf395ae4e0af80aa962383167885a9cb1779d3cab96ccc1d3e5998742a WHIRLPOOL 8792466779f3e249ae584d32bb54f42dc990558b26b288129024b6e66e5b06c23cbed04d922c06e73b7067f6ee8fcbbe86e8ebc82dc0976811f32bef984c4640
 EBUILD django-1.5.10.ebuild 2570 SHA256 4516728575bf4f4386d18ff8b7b3dfc528988a2613314ed652cbaefaac85ee87 SHA512 81c02f0e126ba9c193bce65e06b51a903f927f1b313b34b789b48e6f70ee09bfee38821fe607597e240726fc5d5a9e47a50dd6d2c60ccdd2d22aef5c9da8207d WHIRLPOOL 9cd10f6cf0686cacbc1f74c22a3bbdd66aecb7db7484f392e2b643e322bfac65b34af4fbb631734ba8f62efdf5cb52f8841a56188f072fc3f808cfe5e2430c86
-EBUILD django-1.5.9.ebuild 2569 SHA256 b735074b0aadcab45b759fb0657d0a5304e6d2f17297aec824ef6107de5dd33c SHA512 ca0c262ed213b76bd756f669db4b0014a75b82d5c82b9296b4badf3ca6ffee5dd2d47679f0852f705a187ff675d2bfe7b623ee4730362ef8a5e556f60343c2f1 WHIRLPOOL 4b63d45f100b36769ae9f95c517efdb6f3c2ca0a4a81f6a876e89da26dbe5af97ec6a9777d856e58b03a4e4aa765593c2aa811820bb3907fa58be74c30769e5d
-EBUILD django-1.6.6.ebuild 2684 SHA256 3c8b388d16b86e1f9c626bfeb530eede945e11db23803b5ae78a13af53d9022e SHA512 1245ea8a5818523af6386897eb9abb0b234243c9123f885f8d17b3063a200b6abb475106f770870a23df4f740f76edf1c152d8dfc72c18447abc6d9e2d2b80a6 WHIRLPOOL a365f416c1d744374559dbf2db293341d4f2125ea0d520853c26a381f3a4100b2c49eeda969ee4601be474c200fd380a59f5ecd14712d88b100242f20c1ff56f
-EBUILD django-1.6.7.ebuild 2684 SHA256 ac20d60450edf0d1435cefd2c32fe3f0d0149ccefc84ddd8c43f353bd6a3ece2 SHA512 7db7b9fabb5fce54c6671080aa9f05ae905bd16cb464ae7c34314bb7b91775389b42a7ca49fe217434b097b9cf8c8ec877c99da154358e78b6c920f7106f2756 WHIRLPOOL 340f26362d206e21ce2180c6c52b554a0d21000de9e7e285a6504462e81098db3372dc643f98d5a657e95f6f1b6f6b0c333c584644eef4e592e065014f284a90
-EBUILD django-1.7.ebuild 2766 SHA256 e663f2ba8f07ca83bc6549feedd70604ccd5aeb3215fac9bf10a8a4945ebf63d SHA512 b569fa219680d9bad6a5c9b1145f2508ee55afc09dc698068381bf13dad90f8e827cde13a215a09abbaef29a631a6e1148a884b1b9f639d11028e8a113b10f00 WHIRLPOOL e49e69de1747120e25e8f8d8de716b9cf29f6df68945595b341d0694cf12ca8a8ff0ef9a832216a1c495413d938e403e2d915fbf64e764b3e0c8377e24ce1249
+EBUILD django-1.6.7.ebuild 2686 SHA256 2d4cbba335e51b7ae41580ffee14246d402684b376dd40bad70a70d7386a377a SHA512 49c124e8abcfb9e3e921f88dc7924968469939eb85581a12aaa628108d15375c79970a75f0aa936212fe6e8f4d6edd42f6044f51cd597284eb41311942d6e1c0 WHIRLPOOL 608ec69095c1e771c8a26089ae8a7584b3506a2231a620dc0f38ace5e097e31ec22bf99c0ac7ab5fa6cc632bee4cba45cb459364f81b97eaadecbc71bc0191df
+EBUILD django-1.7.ebuild 2764 SHA256 d44618d4039c10051a2a6c090f39663541a261a61d95379bf7591437b94c5b45 SHA512 371f91749a84a29c624a1af6bc94295000b14cc496849c6c5fb16b40e231f665a748d80d9d2b1909c338d3b5326c9cf5e9b1df96725b63ed4b0d78794343b21c WHIRLPOOL 337e40d750c04315b05ebd519c2b3e01f1b4753f05e719c31383af13dade3204dad36722ee94d22db6029799fbcd4a0d992c7a7f948912c7a8476fee25a890de
 EBUILD django-9999.ebuild 2378 SHA256 53f3f83d91d9fba975d5ee353a91b9ecadb874b2da551b234baeed7747bfae20 SHA512 521cac5140c8ddd2529c9a103ded73427e83a1107804639090cbfb186a7a691aa49c02587fa06081218960f9e34c6b971e4dc2805d160e6c2b775c3c7498afc1 WHIRLPOOL 892b0145749a5446b4b75ee41045795ddd63459d5c0024657d7477c02c8f3c32fafdab8a5e586e623f26c9554fb98a69525ba00e5c43a5e0cdfd6149fa348f86
-MISC ChangeLog 22730 SHA256 db6155bdaf8dea8427765dded1067e12a79363824b592ca356ebf0e1c7a23818 SHA512 536d53da30a57881661094f606d92c66d4676bf00671ab661225f0752b68ca47251d4e7a31819e56d73e4eed0d3736e2833f5a201281b0402f1dfc6a18a72436 WHIRLPOOL eb35741f4ee5a63172d62c9acfd2ed1daf5e170a6d78150947325d1e57867bbfa16de10db691868b5b0d88195af96730bdaa671a6de5a8753f2facc65cf180f9
+MISC ChangeLog 22945 SHA256 3552c514e6480435d95f1096222e2b43804386c8cbd98a92d19ead5718779537 SHA512 1dea553e946f2bcd37e7438a7bd116a23e08d3509566c8a97230c1cb017f31137cb7ed26a861afd7f6d74cd96124c020b1be8eb4200326ce73ac004e297543e1 WHIRLPOOL a36a2fd88b40fb7624408296957b4832eefc69733e9109ffba79fab05d397bb2158f647860c49a5126a484eca5ab695f842a640ab86e9ef8c0c5748cff8549e6
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlQV6cgACgkQso7CE7gHKw3teACg2cVC4/w0nDToVeSm2p8u6kqD
-4XQAnj3/I4SM7NJYqnlG8g4p+AyD/jBT
-=1xNi
+iEYEAREIAAYFAlQZ9KAACgkQso7CE7gHKw2RvACgmswh0d88R3fPlp2FF8TDuAsz
+m7wAn2OBj4XxtFESde0iBDXNoCdQLTAg
+=tW/y
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.4.14.ebuild b/dev-python/django/django-1.4.14.ebuild
deleted file mode 100644
index 943f87e0bcc4..000000000000
--- a/dev-python/django/django-1.4.14.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.14.ebuild,v 1.3 2014/09/02 07:35:08 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.9.ebuild b/dev-python/django/django-1.5.9.ebuild
deleted file mode 100644
index fc5e291b8f18..000000000000
--- a/dev-python/django/django-1.5.9.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.9.ebuild,v 1.3 2014/09/02 07:35:08 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.6.ebuild b/dev-python/django/django-1.6.6.ebuild
deleted file mode 100644
index 2ad0489d7d43..000000000000
--- a/dev-python/django/django-1.6.6.ebuild
+++ /dev/null
@@ -1,88 +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.6.ebuild,v 1.3 2014/09/02 07:35:08 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"
-
-RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
-	postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 'python{3_3,3_4}') )
-	mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}]' python2_7) )"
-DEPEND="${RDEPEND}
-	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
-	test? ( ${PYTHON_DEPS//sqlite?/sqlite} )"
-
-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
-}
diff --git a/dev-python/django/django-1.6.7.ebuild b/dev-python/django/django-1.6.7.ebuild
index d474d3cc0eee..ebc5987baa21 100644
--- a/dev-python/django/django-1.6.7.ebuild
+++ b/dev-python/django/django-1.6.7.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.7.ebuild,v 1.3 2014/09/13 17:24:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.6.7.ebuild,v 1.4 2014/09/17 13:02:10 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~
 IUSE="doc mysql postgres sqlite test"
 
 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
-	postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 'python{3_3,3_4}') )
+	postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) )
 	mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}]' python2_7) )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
diff --git a/dev-python/django/django-1.7.ebuild b/dev-python/django/django-1.7.ebuild
index 135776db8836..5c98b0841e2c 100644
--- a/dev-python/django/django-1.7.ebuild
+++ b/dev-python/django/django-1.7.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.7.ebuild,v 1.1 2014/09/14 05:42:33 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.7.ebuild,v 1.2 2014/09/17 13:02:10 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@@ -22,7 +22,7 @@ IUSE="doc mysql postgres sqlite test"
 
 RDEPEND="virtual/python-imaging[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
-	postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 'python{3_3,3_4}') )
+	postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_USEDEP}]' python2_7 python{3_3,3_4}) )
 	mysql? ( $(python_gen_cond_dep '>=dev-python/mysql-python-1.2.3[${PYTHON_USEDEP}]' python2_7) )"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )