Bug #226505 - For compatibity with phase execution order in >=portage-2.1.5,

call has_version inside pkg_preinst instead of pkg_postinst.
Package-Manager: portage-2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686

4 files changed, 33 insertions, 8 deletions

diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 8c00b247232a..219038415717 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/util-vserver
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.91 2008/05/13 14:45:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.92 2008/06/14 11:02:06 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> util-vserver-0.30.214.ebuild,
+  util-vserver-0.30.215.ebuild:
+  Bug #226505 - For compatibity with phase execution order in >=portage-2.1.5,
+  call has_version inside pkg_preinst instead of pkg_postinst.
 
   13 May 2008; Jeroen Roovers <jer@gentoo.org> util-vserver-0.30.215.ebuild:
   Marked ~hppa (LuckyLuke).
diff --git a/sys-cluster/util-vserver/Manifest b/sys-cluster/util-vserver/Manifest
index d61be6dacc99..d91df73ffcd5 100644
--- a/sys-cluster/util-vserver/Manifest
+++ b/sys-cluster/util-vserver/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX bash_completion 7568 RMD160 45feafa30f715fb287403518eee8c45fecfe418e SHA1 d281bcad111df21ab0f37703142dd102145d784e SHA256 2232166a5aed9857a7a5c30adfdd4ea944e0608a29fad05f229b8cef2d61795d
 AUX util-vserver-0.30.214-baselayout2_path.patch 648 RMD160 7775e5bc109774f9f253a88157739b5eb88ffc87 SHA1 fe8a94e8e0c76989b6d7268f9c9a07183a63b183 SHA256 59ad64c7b5356c16f500dc328eec989844301adeeefd4fe968955a03e9eb2630
 AUX util-vserver-0.30.215-openrc.patch 1138 RMD160 936fe40430a9dcd0f8924d435952400bdfdbf858 SHA1 021d40edec6f602a050c01d1924ca990714face0 SHA256 f6a4d24c708ee882e506f63ad16cf259c06ef7840d860f77da74d8e970e9297c
 DIST util-vserver-0.30.214.tar.bz2 676250 RMD160 fbcf8b23719af991443d59f6c8670e99e2b746d6 SHA1 d0996cd6415db91c869912680e9b9798edd57228 SHA256 c88a27ccd1593f4396e1cf4aca37c715c7618a77d709ad63c7cc744ca1557c45
 DIST util-vserver-0.30.215.tar.bz2 695414 RMD160 62d34d2149fc949f27f7e08e8f4077919dfac838 SHA1 798fb71752420d1dd3d4807eeae37d3d8076662a SHA256 40686ac0652b245fcbb34e52ac8d80ae6b4ea3f73150ebc1ce7c69660ccaa35e
-EBUILD util-vserver-0.30.214.ebuild 3750 RMD160 62ba84efe3897339f4bcd486fc47749996a59606 SHA1 0aa3ded0a867d5bf42a582e9083f965595692d97 SHA256 7917b6808fb452fed465a8dee3efe3f2090f188bb5b157c3432c74aa77792830
-EBUILD util-vserver-0.30.215.ebuild 3743 RMD160 aaf63ce4d219983ff4d11e573322b9b539496f6a SHA1 426dffe175211581882a13dafa0c13bdf6e91b3a SHA256 760257677e9fb5695ed81b594fafcde37bcbda6442491a726ccbf3ada0827c4a
-MISC ChangeLog 18661 RMD160 e051f0b3f13457ce5a60c95a0273ac516038d29c SHA1 300fac5d2efff0e22044ea01887ded882759f4c8 SHA256 36980cca22814b6e06bd20573220193eb61b4db683e6cc5563363199144e0546
+EBUILD util-vserver-0.30.214.ebuild 3828 RMD160 a4f89c2080f5273c165f061a74617a5077d7466a SHA1 26f958b5484692973569249f89cf84eefdf8061f SHA256 2d20c1ad9a4f9b5b2792a5c6c4ad638de56bdb4102e16678e5e7f4f7d1cb8e55
+EBUILD util-vserver-0.30.215.ebuild 3824 RMD160 7cdc4605d7bea1d6293dfa8135f743e213f78a49 SHA1 34d46a639c263e9960fa5f786b4e6528d306518f SHA256 991f8a4d9fb63e317b6f3890d27680a09197780e7c8ded09f97cc32b8a6e26d7
+MISC ChangeLog 18917 RMD160 da57d336edd4b2aebf4bd3432063cea5fb33235e SHA1 f31c6660bb05ed47af7be93d3c4db067fc53bdea SHA256 eda36bf462e4098fd5e7e70fb9944d675a14d042051fc6b8d7c98014402298dd
 MISC metadata.xml 518 RMD160 62a73756fb710a0464dd24600e7ec70c82e13021 SHA1 78ee9f24180c1215ebe02ac3dbba80a7a0c4a82e SHA256 5a4f424248d873af9f0a66aca2e3e60c6165288fa649ef44de4d8418232c5ac0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhTpTIACgkQ/ejvha5XGaNLvwCg5gQHFZwXjrhENZL4sO8UbqgZ
+1u0AnRQLQXm0+CijLmjH03yroB2g+4bG
+=hbnT
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
index 668539b8b564..250821253514 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.214.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/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.4 2008/04/13 10:24:11 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.214.ebuild,v 1.5 2008/06/14 11:02:06 zmedico Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -76,6 +76,11 @@ src_install() {
 	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.30.211"
+	old_init_script_warn=$?
+}
+
 pkg_postinst() {
 	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
 	# present when merging.
@@ -95,7 +100,7 @@ pkg_postinst() {
 	elog " rc-update add vprocunhide default"
 	elog
 
-	if has_version "<${CATEGORY}/${PN}-0.30.211" ; then
+	if [[ $old_init_script_warn = 0 ]] ; then
 		ewarn "Please make sure, that you remove the old init-script from any"
 		ewarn "runlevel and remove it from your init.d dir!"
 		ewarn
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
index ec15cde1c318..01f9606d26f9 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.215.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/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.3 2008/05/13 14:45:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.4 2008/06/14 11:02:06 zmedico Exp $
 
 WANT_AUTOMAKE="1.9"
 
@@ -76,6 +76,11 @@ src_install() {
 	dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.30.211"
+	old_init_script_warn=$?
+}
+
 pkg_postinst() {
 	# Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
 	# present when merging.
@@ -95,7 +100,7 @@ pkg_postinst() {
 	elog " rc-update add vprocunhide default"
 	elog
 
-	if has_version "<${CATEGORY}/${PN}-0.30.211" ; then
+	if [[ $old_init_script_warn = 0 ]] ; then
 		ewarn "Please make sure, that you remove the old init-script from any"
 		ewarn "runlevel and remove it from your init.d dir!"
 		ewarn