Expand elog message for upgrades.

Package-Manager: portage-2.1.2.7

3 files changed, 18 insertions, 23 deletions

diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog
index 07735deaf193..68fec90b7c52 100644
--- a/net-www/apache/ChangeLog
+++ b/net-www/apache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/apache
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.531 2007/06/02 08:05:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.532 2007/06/02 19:34:35 chtekk Exp $
+
+  02 Jun 2007; Luca Longinotti <chtekk@gentoo.org> apache-2.2.4-r4.ebuild:
+  Expand elog message for upgrades.
 
   02 Jun 2007; Christian Heim <phreak@gentoo.org> apache-2.2.4-r4.ebuild:
   Adding the missing mods="${mods} suexec" declaration to the ebuild, fixing
diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest
index be83e51283e5..830f6f9229ad 100644
--- a/net-www/apache/Manifest
+++ b/net-www/apache/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST apache_1.3.34.tar.gz 2468056 RMD160 e39dfc57b7f9164aa76641de3fa74f0314c9ec9e SHA1 df082b73f1220555dc416c0c5afa746e30a9e0de SHA256 ceed243f4f98e4323b48e5f7f80e306d1abb00c592e18de5575983db42d6f8d4
 DIST apache_1.3.37.tar.gz 2665370 RMD160 de84adf2fd0a745c32072ca5dc5e1374cfcf04f7 SHA1 b422fac1dda10baa483e8f4378dff58faf3f85b4 SHA256 9f27889bfbf418b987a892160e52fd217d66391df2870f3ecac877ef565c4bfc
 DIST gentoo-apache-1.3.34-r14-20060726.tar.bz2 28001 RMD160 955a0ba00287db8859ce03ba6ccfdc2cfaa3bd12 SHA1 d05f1d554bc5b7021fa89750cd47e79aeecc94f7 SHA256 808e88b32d9ee7181d1cb789f24da21ccd059c8789eff9989bd92826fe826149
@@ -30,14 +27,14 @@ EBUILD apache-2.0.59-r2.ebuild 14079 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3e
 MD5 6dcdc4563ddbbc21f13ed8aa24f5242d apache-2.0.59-r2.ebuild 14079
 RMD160 c9be7324ff9eaeb62c6a7667f7339c3e7d3ecc32 apache-2.0.59-r2.ebuild 14079
 SHA256 7f4d8e4095e0e785ebb2e9b73b3702494157dfbb6125d0ee98041eacc79b6378 apache-2.0.59-r2.ebuild 14079
-EBUILD apache-2.2.4-r4.ebuild 14275 RMD160 c8f55634bec4dadb5ab19d1ac1ac5b28dbc0663d SHA1 365ddf75f02354dd171ccda87be69551273780f7 SHA256 e5a5a27532d66540ae267b1ec06133e763afc2fe5d0464a2a1584ff1d9584160
-MD5 b654a00c3c702f9772b2c77c26fa2ead apache-2.2.4-r4.ebuild 14275
-RMD160 c8f55634bec4dadb5ab19d1ac1ac5b28dbc0663d apache-2.2.4-r4.ebuild 14275
-SHA256 e5a5a27532d66540ae267b1ec06133e763afc2fe5d0464a2a1584ff1d9584160 apache-2.2.4-r4.ebuild 14275
-MISC ChangeLog 91369 RMD160 37640210dab69a94dcba407733d6522f373004bb SHA1 3f5293f6c2e4d56495be1f277337f75616aab5b6 SHA256 5970ce96fbe997bff4b20a704299e91b56b4c6a27d10efe4a43490eff1756b4c
-MD5 7bba5420b65df3036e69abc0d321d397 ChangeLog 91369
-RMD160 37640210dab69a94dcba407733d6522f373004bb ChangeLog 91369
-SHA256 5970ce96fbe997bff4b20a704299e91b56b4c6a27d10efe4a43490eff1756b4c ChangeLog 91369
+EBUILD apache-2.2.4-r4.ebuild 14341 RMD160 3b46d417c9206431166fc3c165099a390c94b63a SHA1 61ae8f8412a3ae8a93c5cff1352a6fdabf3849e5 SHA256 7b20bfa3e92b676532c683094ce4a0261b12e2c2459082c917fbaffd8d7ad63c
+MD5 6f2bc1a0c0b4206db18e31e308b2bab7 apache-2.2.4-r4.ebuild 14341
+RMD160 3b46d417c9206431166fc3c165099a390c94b63a apache-2.2.4-r4.ebuild 14341
+SHA256 7b20bfa3e92b676532c683094ce4a0261b12e2c2459082c917fbaffd8d7ad63c apache-2.2.4-r4.ebuild 14341
+MISC ChangeLog 91481 RMD160 dfd0dfe10929a0972d5015a20e9a96e257ca3cc8 SHA1 d6ddd2530a2553c65b29ca9209eb235a3aad2168 SHA256 12e8c5bf336e5097ed51feab462b140a7c1d72007a1c7e2a677ee8c66981b84c
+MD5 8864e60d0338b596e3f8d27b89892af7 ChangeLog 91481
+RMD160 dfd0dfe10929a0972d5015a20e9a96e257ca3cc8 ChangeLog 91481
+SHA256 12e8c5bf336e5097ed51feab462b140a7c1d72007a1c7e2a677ee8c66981b84c ChangeLog 91481
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 MD5 0f28752ee3545b3fd8e28ee656e62f4b metadata.xml 551
 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 metadata.xml 551
@@ -57,10 +54,3 @@ SHA256 d3d9b85e6d0dc1610726f52d7f45f34e144351cf96d449bdabcd362482405cb5 files/di
 MD5 38edd1af75c85f80e52ce2199c3e27cf files/digest-apache-2.2.4-r4 536
 RMD160 f84f8b4042aad943376d8793a3e286227550eb39 files/digest-apache-2.2.4-r4 536
 SHA256 b63dbb8203cd4642230f9140871dd3ce914bfa09d82942dc33a216fa8a988f79 files/digest-apache-2.2.4-r4 536
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGYSTuyuNVb5qfaOYRAsxfAJ9Nk1wu7/N4oXuA3LzkC4HTUKShBACffwhy
-pykpOHFVjm/DkWPXeZsYhNc=
-=AUAG
------END PGP SIGNATURE-----
diff --git a/net-www/apache/apache-2.2.4-r4.ebuild b/net-www/apache/apache-2.2.4-r4.ebuild
index d3cced976b9c..3d6896da552a 100644
--- a/net-www/apache/apache-2.2.4-r4.ebuild
+++ b/net-www/apache/apache-2.2.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r4.ebuild,v 1.3 2007/06/02 08:05:58 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.2.4-r4.ebuild,v 1.4 2007/06/02 19:34:35 chtekk Exp $
 
 inherit eutils flag-o-matic gnuconfig multilib autotools
 
@@ -345,8 +345,6 @@ pkg_postinst() {
 	fi
 
 	# Check for dual/upgrade install
-	# The hasq is a hack so we don't throw QA warnings for not putting
-	# apache2 in IUSE - the only use of the flag is this warning
 
 	if has_version '<net-www/apache-2.2.0' ; then
 		elog
@@ -355,7 +353,9 @@ pkg_postinst() {
 		elog "to continue working correctly."
 		elog
 		elog "Also note that some configuration directives have been"
-		elog "split into their own files under ${ROOT}/etc/apache2/modules.d."
+		elog "split into their own files under ${ROOT}/etc/apache2/modules.d/"
+		elog "and that some modules, foremost the authentication related ones,"
+		elog "have been renamed."
 		elog
 		elog "Some examples:"
 		elog "  - USERDIR is now configureable in ${ROOT}etc/apache2/modules.d/00_mod_userdir.conf."
@@ -363,6 +363,8 @@ pkg_postinst() {
 		elog "For more information on what you may need to change, please"
 		elog "see the overview of changes at:"
 		elog "http://httpd.apache.org/docs/2.2/new_features_2_2.html"
+		elog "and the upgrading guide at:"
+		elog "http://httpd.apache.org/docs/2.2/upgrading.html"
 		elog
 		elog "Some modules do not yet work with Apache 2.2."
 		elog "To keep from accidentally downgrading to Apache 2.0, you should"