Cleanup webapp.eclass usage.

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

4 files changed, 23 insertions, 29 deletions

diff --git a/dev-python/django/ChangeLog b/dev-python/django/ChangeLog
index dc7ae2fa0e0c..10cd3c2cb5dd 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.109 2013/06/01 19:35:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/ChangeLog,v 1.110 2013/06/02 04:22:26 floppym Exp $
+
+  02 Jun 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.1.ebuild,
+  django-9999.ebuild:
+  Cleanup webapp.eclass usage.
 
   01 Jun 2013; Mike Gilbert <floppym@gentoo.org> django-1.5.1.ebuild,
   django-9999.ebuild:
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index bd2f8b1ea31b..2dd87416a0fe 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -22,14 +22,14 @@ EBUILD django-1.4.2-r2.ebuild 2610 SHA256 67db386941423f807f523d3e0cb85014f6917a
 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-r1.ebuild 2492 SHA256 5d47917b278397f71a27500ba6a306ace115b270c11d40496f32b3752eb7d740 SHA512 39fdd7ea49fb8b68eb534bec7df773a8996c17ad2d5f0e7a6100763d5e6d5eeb8330a1ab99e52a322ced0ebc584f3763581c60eaefd273f1b5dd9cd28c2f4fac WHIRLPOOL 4e0a3682ac9bf987c24dfcaa3c354e35dad4e38bef5dbca20bf12ac208c8f3eddda81b15119b3af19207cc1f7a1b4d2dac6e9d4f47c24a454aef5d07804ef184
-EBUILD django-1.5.1.ebuild 2570 SHA256 9478d49dfeac6bf74192414093977034b68905f88cbaffbc24cfe7b7086400c8 SHA512 02e3ca0bb98070ab6a102cac9307af0e8500d12bd805a5c1cc3f4a0ed0db35a3b5c19f3e98ff5c3fcd265c44b7700eb39ffa70151808f69a46d6d86dd6385e50 WHIRLPOOL 7377dceece4ffefb9e9ac37ea38be8967f9ea4fda5e0de0a746df2cb6d52f6ec881db07c90d2fcb6e49e93a0bad2c6aa8671451f957ad394eb3789a67fda8f27
-EBUILD django-9999.ebuild 2570 SHA256 dd2af8602decce186c143fe77a2361a22ac15d89bb40957c7b739bed244e5c5e SHA512 5ae1f9352d714558841984f612a00ad1adb97a1004471277c2195216bb0120d0a6160444de4c0162c6ea283ef519b855ed46022fac6dedf246aa99437336b1fd WHIRLPOOL d0198db9986c80a4d5ff81e78cfe6021fbac9c8221ed91091494b5b081708a7b7ec94bcb1d4b60b7dd5c29f6ad993537c9ebc9087f07fda0b68505e82c488ce4
-MISC ChangeLog 16825 SHA256 56c65e96cd42754de2f3f0d82b515cbf70dd32567431e72ff470f004430bb5f6 SHA512 854d80786e8e603bab26b132c7c3ab7db4108635fadf96c5bfb398015473bab73531ffd5ed9de2b950cc19203ef22a5fe2cd3fbbb0947d2aea87661b36e541ca WHIRLPOOL eb9afea0c1da0aa47aeb3d4bc2b7e59a607509aa997e6550616202d45057dbd3bb327a1d9c8541ef8c290ff4e25ec39d84216c975c700491c0fa77f165dd1295
+EBUILD django-1.5.1.ebuild 2378 SHA256 64454ec304a6afd86e3cd8728872d49c4118b51bf085a5e3df175abf7dd21e08 SHA512 e4591034c15860c6205f28dbeed751a57131e16a5633a273948b35dea23eee5c4516549da95909e1da4f503e6f15a2b83ce9796306ba4d69d0920ebef75dc35b WHIRLPOOL a076ea96b20811608b1ba616f9e9fb045b4d417166fe23dafd655f1d95e6dbd88dc4eb594d08ee49c660c2634d1f8cb4e4fd0d01e95f9234224c0139afb2f3aa
+EBUILD django-9999.ebuild 2378 SHA256 7bab217e56b3cbafc16f45b32462afc0ad791658c123df2100e2336622332fcc SHA512 bc2a6a3217627133b74115c02f93eaf71b250f410f39f433baf86da74dd45bc7c8b191b10fa40ef299f1f9a98f0a12f223953c6050321f246052a2ce90cf588f WHIRLPOOL fecb6f73ff804f70c468ffa79d64f12aa5960c171f61be323bbf0a5cfde35c042752bf8e61c3af1b1a50ab64002c675120381f4412a3fb37d0861efa1d14dd43
+MISC ChangeLog 16949 SHA256 aa4e4375d8ed0547ecd14f2d77530d3813f5475100afe630b7b7a14bb7ef34ea SHA512 01f03018afef7cd13b4c168d296f1f2cc69ee58403b48d50c243462aaf7ff74d34f39e89bf84d09f9e921747216a3af9128f253281d8f7f1d780809249c56feb WHIRLPOOL dce9b754c215fa867274cafeaa15876f774b34b333948219d5cb13c05da346a5039746e1910e40d0bcd12acb8435e0658ff41db0455c842b3e71a732005c363a
 MISC metadata.xml 160 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a SHA512 7c02a1de1ddcb6b7c6378cceff0458da3a15d5381417f7cdf01874e7c372664b8899863f41b3a2fd8d6ad67ceb732dac6da0cc17575bf8e3e6d89480417c6628 WHIRLPOOL ed2795e4466eda8c804d5067c87386e269a59fe959393057ca5ddc36851e00f5210c4da1adf4bbdfdbb7d1d3d5c60aced25727ca12fdc8305d9e263a3aca9b13
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGqTQoACgkQC77qH+pIQ6Tm8wD/ZLxhSBSLHdzk1klj1PB8uTxS
-g8LC7cURTaqGF5NpdSgA/10tpUiFRTwC07jP1lMt5kDjG+Moaqc3Lh5KIVvn2IMO
-=1JF2
+iF4EAREIAAYFAlGqyIMACgkQC77qH+pIQ6TDMQEApg4BoEJB/ScisnijDO5kXC4L
+D5Bkcp1FyQouVjlP9akA/Rb5128Kw9qGynwUj8EjJn9f42DNCB87vGyPBMQi/iFK
+=kpy7
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django/django-1.5.1.ebuild b/dev-python/django/django-1.5.1.ebuild
index e4b26c604540..485609e048d2 100644
--- a/dev-python/django/django-1.5.1.ebuild
+++ b/dev-python/django/django-1.5.1.ebuild
@@ -1,10 +1,11 @@
 # 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.1.ebuild,v 1.3 2013/06/01 19:35:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-1.5.1.ebuild,v 1.4 2013/06/02 04:22:26 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
 
 inherit bash-completion-r1 distutils-r1 versionator webapp
 
@@ -74,14 +75,8 @@ 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."
+	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-9999.ebuild b/dev-python/django/django-9999.ebuild
index e9db0a09b028..035426e524fa 100644
--- a/dev-python/django/django-9999.ebuild
+++ b/dev-python/django/django-9999.ebuild
@@ -1,10 +1,11 @@
 # 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.21 2013/06/01 19:35:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django/django-9999.ebuild,v 1.22 2013/06/02 04:22:26 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
 PYTHON_REQ_USE='sqlite?'
+WEBAPP_NO_AUTO_INSTALL="yes"
 
 #if LIVE
 inherit git-2
@@ -79,14 +80,8 @@ 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."
+	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
 }