Update live ebuild.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 21 insertions, 34 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index b92bbda4a068..765438ced6a6 100644
--- a/dev-python/django/ChangeLog
+++ b/dev-python/django/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/django
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.103 2013/03/30 13:15:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.104 2013/03/30 13:21:39 floppym Exp $
+
+  30 Mar 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.ebuild,
+  django-9999.ebuild:
+  Update live ebuild.
 
   30 Mar 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.ebuild:
   Remove obsolete sed commands.
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 0ede46656294..4777ddd4743a 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -16,14 +16,14 @@ EBUILD django-1.4.1.ebuild 3032 SHA256 d01f0758c4a93e1a6542c16c0cf9d56abc147233f
 EBUILD django-1.4.2-r2.ebuild 2610 SHA256 67db386941423f807f523d3e0cb85014f6917aa356b79e814ab6953e5a72082e SHA512 4a2304442b179d0122e45ef8b95002772e8348fee3a58838c047ad3ce6e22c59f052d90eaefaa337d5f990ffade85013dcd150e8cbb59ac20c5462685d68c665 WHIRLPOOL d29f2405e4ba242378124f09dda3b31319de4b0fd7a2cf9c5f0b41513a81ee2ec33ce8448f951fb7a96a8c084df256a415804ab19d52e93199d83f7d7936200b
 EBUILD django-1.4.2.ebuild 3023 SHA256 991f232fba410418ac7c5952cada10986fdc75568e565e5085d27682c76533ee SHA512 5b44fb0d61e9a756b1afde8281fda80772537f5570d119a885fe03d0e974a6537780cc053801d7283ab7802639b45fb676c2b553a4668032899c227f72dea7e0 WHIRLPOOL 8ebfac3bbe188904b843c18486f4df00da0fc68d35de12eeac6ed026d88b469631cea3053ded73c8924d8024d4d67317c47f90c185fe5a58751f0bbc04b7dfed
 EBUILD django-1.4.5.ebuild 2773 SHA256 2b110150586cb5e4434642285be1e843007dfebe8a522539c4acb45a8a33c50b SHA512 a9a7fa0054a7ac66464350cb193b6f54f16bd7517240aba6a176956352ff657ae41ea943db6d56cf22ab0d01d65a0b7a17ae8ff7e43aedc7ad3da596a755cda3 WHIRLPOOL 19a932679a449d14e02b1bcd8a7769a9ec67fdefebe548774d33a1b4fa57299d9880d7b61d837003b8cfd62655b0dea1c8d60f814c2875bfc9547d531322b45d
-EBUILD django-1.5.ebuild 2405 SHA256 812da10a2f910c9595bd8e330f7ac967822691c2a41e0054d0d8c92ee2ae5700 SHA512 edc9995558d50d9ccd385ba37899871c47c0a56b1d486436d0eae83feaa1905f3f9dcce06c8dfee09057167583cd9554d497073b657700993c25887f81f699de WHIRLPOOL 8a839af574436dfb3594b5680141363cc5c1e3ebe5a23f6a699a03f634fa75a7a9083f7ce6348964bcfba7392600110d29cfc853246c9b77e063dd4fdde835ea
-EBUILD django-9999.ebuild 2819 SHA256 77977c2f51af468c27302ebde0613fb65f5ce013604961c00030ddd6a145df30 SHA512 ff83bc2fac6a0f22d107d331faa8b94b36273aaa315e5c123c75699dd3e7145b3aec8904c0b0387605ea78b13484cf3cebd855fa63b909188ff8da4cabb546f6 WHIRLPOOL 825ca5fd804085d616da4b0679dd163372bad3c99041876809c56ada26a16e8e2b7526aff37e998a1cd3ff6914f07e4ed471ed385e49c6c8c0bcb0a7a9e78ca6
-MISC ChangeLog 15768 SHA256 4ffa8d82a10999bcfc65fd255e3b070de57de8c8275aeacedd3aeead5d9267a6 SHA512 7b628a56deffd1d932a64a0d8e1a189891b7b0eb7660aea72df1781dc43cac634852258809922f1e92e6633efeffeeac4519b27c38ca50240886eea1fc68d900 WHIRLPOOL 428ca9e2ea95b450d5fda316d2f504254a4e0e8452da6fa12e32fadd7190c82d3709d5b4ce3b3995e4316ec3d7f0f8ed2fa5152427325591330dabab3467123f
+EBUILD django-1.5.ebuild 2361 SHA256 c65ca71381984154739459d3a73f46f1bcc2d945787bce38aedafc7ce50524cf SHA512 e0946861c9b2fa0fef65c319baac5e33d9e2857f1b8d19b3c913c44530718821b0d8739d26467607905b45d90b24f4272dfe7fe73387f13598288ee4e0370870 WHIRLPOOL 21e7f5dfad4070215053f8b7c080cebe2cf20252247dbbb457794afd795fdc490161c12563a3bb7a613cc13cdc6588ec86abaabdd279aa5fb3ff960f1e9e0486
+EBUILD django-9999.ebuild 2519 SHA256 bd45f8f78c2f830b1d8da6c96897f5825f585277f04136a6361c2dce41e28fbc SHA512 f5fe7c61fbcf645cb909a8e97f02fa2b94791aeb77a1239045d187db1f34a0e12f778f3a669b44ca418f8bef05473c79aba5bfa2db2aae0b842c2c9c1d8f2859 WHIRLPOOL 52d1dc2a59d19a7febd89880f0b8cb8b1419f9cc1bad32536278d89176fbf3b2ad20f47d554391a374271659763f6acb79ecccc37b78107d1a6e037ee33b95b0
+MISC ChangeLog 15881 SHA256 f0f88819f1fac65f29c581ae168d5b052f1cdb7f1f4f336a125692ce02992763 SHA512 1d22a8a2000063466815e8f673cf9ba163f2f412895ee8664f165125dc4eb023704d4019fc4c6bdff4683b3583eee0832d9b15ba2f28a0143d7c459105543bbe WHIRLPOOL e753945062980f693ef2091613480a003fee3ebd723981f4f7da876b39213e349dd911f54ca1dc093badd5318660d3f942625968c4d93e7a0064ff745b897fb8
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFW5WgACgkQC77qH+pIQ6Rj/wD/Q5PBBmh5OBB3i1GocYlrF4wc
-7JRrO/0kvwuPLEmwE1sA/iXfpuVwuElk2Ua2B0H3zvH2NWh4NRoldcfpwDka4xTG
-=Jp8C
+iF4EAREIAAYFAlFW5uUACgkQC77qH+pIQ6T8+gD+M0z80Ce8qv8EcKCw2SIIOvkC
+f10Ph/BSkLQhDixIGnEBAKGXQ9z1bVKE3U2ugf9A7QkAQS8VC+Z0oSL50UOXhjJH
+=PNkD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.5.ebuild b/dev-python/django/django-1.5.ebuild
index 4d359a60fcc4..5bd014842ac9 100644
--- a/dev-python/django/django-1.5.ebuild
+++ b/dev-python/django/django-1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v 1.4 2013/03/30 13:15:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.ebuild,v 1.5 2013/03/30 13:21:39 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -49,11 +49,6 @@ src_test() {
 	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}
@@ -65,6 +60,8 @@ python_install_all() {
 
 	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
 	doins -r django/contrib/admin/static/admin/.
+
+	webapp_src_install
 }
 
 pkg_postinst() {
diff --git a/dev-python/django/django-9999.ebuild b/dev-python/django/django-9999.ebuild
index 365bd72a2f84..4eeaa2cbeb4c 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.18 2013/02/23 21:26:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.19 2013/03/30 13:21:39 floppym Exp $
 
 EAPI=5
-
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='sqlite?'
 
 #if LIVE
@@ -26,9 +25,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc mysql postgres sqlite test"
 
-RDEPEND="dev-python/imaging[${PYTHON_USEDEP}]
+PY2_USEDEP=$(python_gen_usedep 'python2*')
+RDEPEND="dev-python/imaging[${PY2_USEDEP}]
 	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
-	mysql? ( >=dev-python/mysql-python-1.2.3[${PYTHON_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} )"
@@ -42,21 +42,6 @@ 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_compile_all() {
 	use doc && emake -C docs html
 }
@@ -77,7 +62,6 @@ src_test() {
 
 python_install_all() {
 	distutils-r1_python_install_all
-
 	newbashcomp extras/django_bash_completion ${PN}
 
 	if use doc; then
@@ -98,6 +82,8 @@ pkg_postinst() {
 	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."
 }