Bug #226505 - For compatibility with phase execution order in

>=portage-2.1.5, call has_version inside pkg_preinst instead of
pkg_postinst.
Package-Manager: portage-10652-svn/cvs/Linux 2.6.25-0518-x86-64 i686

5 files changed, 83 insertions, 26 deletions

diff --git a/www-servers/apache/ChangeLog b/www-servers/apache/ChangeLog
index 4024c2cdb15d..ade52f1509d6 100644
--- a/www-servers/apache/ChangeLog
+++ b/www-servers/apache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-servers/apache
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.73 2008/06/11 19:08:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/ChangeLog,v 1.74 2008/06/14 13:13:42 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> apache-2.2.8.ebuild,
+  apache-2.2.8-r3.ebuild, apache-2.2.8-r4.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
 *apache-2.2.8-r4 (11 Jun 2008)
 
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 294cdcf73f7c..8a6ce9b685b1 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -5,15 +5,15 @@ DIST gentoo-apache-2.2.8-20080119.tar.bz2 60363 RMD160 c54970fdbd8e5906db5a86d38
 DIST gentoo-apache-2.2.8-r3-20080601.tar.bz2 60383 RMD160 f7d662ac9bce6bcc0e0506503be166fdb7a95eba SHA1 1d87d6ed727a8b7074446a472eb46d2b1a9eb532 SHA256 bc1bdc87aab4cfc377e2016e69f715495097bf37c47112ac6d52929adf0fbc40
 DIST gentoo-apache-2.2.8-r4-20080611.tar.bz2 60580 RMD160 81b0713d86f2856670fb75999f8e248a9c71622e SHA1 ed0ad64cf7eef057e23515571d4b6a3111e6fc01 SHA256 48509b3846c04c9c31db00a7d2a98a8156e839f895635ad398f84e73ce9e91c7
 DIST httpd-2.2.8.tar.bz2 4799055 RMD160 0736ea9617bafaa1c8cd34ce4fc1c7a659afea57 SHA1 5074904435d3d942ce2dc96c44b07294b8eaca77 SHA256 2ad8d0db1e478838ba88a0ddaf538c7150027d937b017739fdcb3fabb96ebd39
-EBUILD apache-2.2.8-r3.ebuild 5245 RMD160 bc51c57f335f04f2c871120be499a4034510273b SHA1 ba66a1ac206062bd4a3a4d565835c442adf435ae SHA256 eb98e1b0492e66b8c5ed171b8ca03ff6f3a2eaa7270af36499d8d7826532d2b2
-EBUILD apache-2.2.8-r4.ebuild 5251 RMD160 32008a628c625d721bf08474bd82538b7c7f0efc SHA1 b58579dda400764b4504090e21b165847efb6d14 SHA256 018fbc861fffe5da6f8d642faadc9eba8fd96a5d1398ea1c556fac7cc99cffc8
-EBUILD apache-2.2.8.ebuild 5171 RMD160 4a35610d97a4ac037f2c3b6a93577f0d160b6913 SHA1 68f63011f6d3cb890e3b2eb7d8a109d64e772505 SHA256 64ff85456d56465c48bd62a32644b1e03ba9f09644df0e217018c2008f504556
-MISC ChangeLog 102937 RMD160 cefa4fef9ddc07c1a78f788920e49694229f2985 SHA1 599c206d356f9dd870924c5e3f18842e1e5b24cd SHA256 756ddd56baf223bd500505f95e4389563e9e2fa21cd3c26c6064d9b340c95936
+EBUILD apache-2.2.8-r3.ebuild 5580 RMD160 c608b5208169d4f7ba2d14db10e5ba7613cd5fb7 SHA1 758a746fc2a0fbc1b3280ddf09c1cadb6041b1ef SHA256 02153c8ca731edb22f5cea6d56c8229267ae1df14afc88b072ac08478ce5d9e9
+EBUILD apache-2.2.8-r4.ebuild 5588 RMD160 21e69bf007a79785150a6e8303e638db5317a6c4 SHA1 eb42962370f7b213c385b3bfb22cd97d34b6d3c6 SHA256 74a60193269b6e6fcfe2f1212205731a65658ed7233a9543b6d07429336adb50
+EBUILD apache-2.2.8.ebuild 5508 RMD160 11127bc5789faf304e3edd620db3ae3d91eba420 SHA1 6340e4ee01aacb8a95b971f75d57de6a512f07e9 SHA256 298ce4a20742f73a9400675acba2d2671828b150ce1e4de2b38919a35d50c049
+MISC ChangeLog 103203 RMD160 168c5564e2487df5eaf4185b66597508a78368b6 SHA1 fc1f96fc8be15d0e909b4e32b862151c811b792a SHA256 b33931c65c8dde37f0a1730f6d3bb6d6dbb0f90c8c5f2dbf1f3f63516d361907
 MISC metadata.xml 551 RMD160 1b31261c043e57cabc9bd8582f9b34c09d92d108 SHA1 68bb286a67452c3dae7525195c60b8637cca9b81 SHA256 646729a42ddffcbde3426dd6aa9a77fab923bc348c5b34c9d24083d86fbb15eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhQItUACgkQmPFBzbX68WEsDgCdGE/uRoZcfLQ85wCrImfSnbJB
-pCEAoIfZcpmwakVQKREY4PGJxFM7Sj7n
-=S/Pj
+iEYEARECAAYFAkhTxAoACgkQ/ejvha5XGaPS1gCfS5KZsBQFaIBTtVjvrJqt3htU
+nf0AoPNQelpJrs6rOwh4QIalPWRWavQd
+=mLYx
 -----END PGP SIGNATURE-----
diff --git a/www-servers/apache/apache-2.2.8-r3.ebuild b/www-servers/apache/apache-2.2.8-r3.ebuild
index 28a331231ce8..4cc7f00ce72e 100644
--- a/www-servers/apache/apache-2.2.8-r3.ebuild
+++ b/www-servers/apache/apache-2.2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r3.ebuild,v 1.8 2008/06/07 14:04:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r3.ebuild,v 1.9 2008/06/14 13:13:42 zmedico Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20080601"
@@ -97,12 +97,29 @@ src_unpack() {
 	apache-2_src_unpack
 }
 
+pkg_preinst() {
+	has_version ">=${CATEGORY}/${PN}-2.2.4"
+	remove_upstream_configs=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.6-r1"
+	auth_ldap_define_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r7"
+	vhost_directives_moved=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r5"
+	config_layout_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.0"
+	previous_less_than_2_2_0=$?
+}
+
 pkg_postinst() {
 	apache-2_pkg_postinst
 
 	# previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
+	if [[ $remove_upstream_configs = 0 ]] ; then
 		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 		fi
@@ -115,7 +132,7 @@ pkg_postinst() {
 	fi
 
 	# note regarding IfDefine changes
-	if has_version '<www-servers/apache-2.2.6-r1' ; then
+	if [[ $auth_ldap_define_changed = 0 ]] ; then
 		elog
 		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
 		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
@@ -125,7 +142,7 @@ pkg_postinst() {
 	fi
 
 	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
+	if [[ $vhost_directives_moved = 0 ]] ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
@@ -137,7 +154,7 @@ pkg_postinst() {
 	fi
 
 	# note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
+	if [[ $config_layout_changed = 0 ]] ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -150,7 +167,7 @@ pkg_postinst() {
 	fi
 
 	# check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
+	if [[ $previous_less_than_2_2_0 = 0 ]] ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
diff --git a/www-servers/apache/apache-2.2.8-r4.ebuild b/www-servers/apache/apache-2.2.8-r4.ebuild
index c12dc92fa325..7cff1fe095d5 100644
--- a/www-servers/apache/apache-2.2.8-r4.ebuild
+++ b/www-servers/apache/apache-2.2.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r4.ebuild,v 1.1 2008/06/11 19:08:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8-r4.ebuild,v 1.2 2008/06/14 13:13:42 zmedico Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20080611"
@@ -97,12 +97,29 @@ src_unpack() {
 	apache-2_src_unpack
 }
 
+pkg_preinst() {
+	has_version ">=${CATEGORY}/${PN}-2.2.4"
+	remove_upstream_configs=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.6-r1"
+	auth_ldap_define_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r7"
+	vhost_directives_moved=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r5"
+	config_layout_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.0"
+	previous_less_than_2_2_0=$?
+}
+
 pkg_postinst() {
 	apache-2_pkg_postinst
 
 	# previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
+	if [[ $remove_upstream_configs = 0 ]] ; then
 		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 		fi
@@ -115,7 +132,7 @@ pkg_postinst() {
 	fi
 
 	# note regarding IfDefine changes
-	if has_version '<www-servers/apache-2.2.6-r1' ; then
+	if [[ $auth_ldap_define_changed = 0 ]] ; then
 		elog
 		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
 		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
@@ -125,7 +142,7 @@ pkg_postinst() {
 	fi
 
 	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
+	if [[ $vhost_directives_moved = 0 ]] ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
@@ -137,7 +154,7 @@ pkg_postinst() {
 	fi
 
 	# note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
+	if [[ $config_layout_changed = 0 ]] ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -150,7 +167,7 @@ pkg_postinst() {
 	fi
 
 	# check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
+	if [[ $previous_less_than_2_2_0 = 0 ]] ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"
diff --git a/www-servers/apache/apache-2.2.8.ebuild b/www-servers/apache/apache-2.2.8.ebuild
index 991e020f246c..1df3ea3fcb02 100644
--- a/www-servers/apache/apache-2.2.8.ebuild
+++ b/www-servers/apache/apache-2.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8.ebuild,v 1.8 2008/04/20 21:12:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/apache/apache-2.2.8.ebuild,v 1.9 2008/06/14 13:13:42 zmedico Exp $
 
 # latest gentoo apache files
 GENTOO_PATCHSTAMP="20080119"
@@ -96,12 +96,29 @@ src_unpack() {
 	apache-2_src_unpack
 }
 
+pkg_preinst() {
+	has_version ">=${CATEGORY}/${PN}-2.2.4"
+	remove_upstream_configs=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.6-r1"
+	auth_ldap_define_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r7"
+	vhost_directives_moved=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.4-r5"
+	config_layout_changed=$?
+
+	has_version "<${CATEGORY}/${PN}-2.2.0"
+	previous_less_than_2_2_0=$?
+}
+
 pkg_postinst() {
 	apache-2_pkg_postinst
 
 	# previous installations of apache-2.2 installed the upstream configuration
 	# files, which shouldn't even have been installed!
-	if has_version '>=www-servers/apache-2.2.4' ; then
+	if [[ $remove_upstream_configs = 0 ]] ; then
 		if [[ -f "${ROOT}"etc/apache2/apache2.conf ]] ; then
 			rm -f "${ROOT}"/etc/apache2/apache2.conf >/dev/null 2>&1
 		fi
@@ -114,7 +131,7 @@ pkg_postinst() {
 	fi
 
 	# note regarding IfDefine changes
-	if has_version '<www-servers/apache-2.2.6-r1' ; then
+	if [[ $auth_ldap_define_changed = 0 ]] ; then
 		elog
 		elog "When upgrading from versions 2.2.6 or earlier, please be aware"
 		elog "that the define for mod_authnz_ldap has changed from AUTH_LDAP"
@@ -124,7 +141,7 @@ pkg_postinst() {
 	fi
 
 	# note the changes regarding DEFAULT_VHOST and SSL_DEFAULT_VHOST
-	if has_version '<www-servers/apache-2.2.4-r7' ; then
+	if [[ $vhost_directives_moved = 0 ]] ; then
 		elog
 		elog "Listen directives have been moved into the default virtual host"
 		elog "configuation. At least DEFAULT_VHOST has been enabled for you"
@@ -136,7 +153,7 @@ pkg_postinst() {
 	fi
 
 	# note the user of the config changes
-	if has_version '<www-servers/apache-2.2.4-r5' ; then
+	if [[ $config_layout_changed = 0 ]] ; then
 		elog
 		elog "Please make sure that you update your /etc directory."
 		elog "Between the versions, we had to changes some config files"
@@ -149,7 +166,7 @@ pkg_postinst() {
 	fi
 
 	# check for dual/upgrade install
-	if has_version '<www-servers/apache-2.2.0' ; then
+	if [[ $previous_less_than_2_2_0 = 0 ]] ; then
 		elog
 		elog "When upgrading from versions below 2.2.0 to this version, you"
 		elog "need to rebuild all your modules. Please do so for your modules"