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-2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686

5 files changed, 42 insertions, 11 deletions

diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog
index bde6ef02faaf..af15eae73833 100644
--- a/net-misc/ser/ChangeLog
+++ b/net-misc/ser/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ser
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.29 2008/05/21 18:59:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.30 2008/06/15 11:04:25 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> ser-0.9.4.ebuild,
+  ser-0.9.6.ebuild, ser-0.9.7.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> ser-0.9.4.ebuild,
   ser-0.9.6.ebuild, ser-0.9.7.ebuild:
diff --git a/net-misc/ser/Manifest b/net-misc/ser/Manifest
index 76bd3660a6f1..d74a94f7c5be 100644
--- a/net-misc/ser/Manifest
+++ b/net-misc/ser/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ethz-1.0-ser-0.9.0.diff 378 RMD160 6eaf1b30f909bc6385a6d9b1ba03f8e007b668b8 SHA1 5619918bdff96e5e36788c6e8aa21f25ec5c37db SHA256 232a7853be7d7c01170e75472ef671c30963b9651238ca06455233c49b4d04a7
 AUX ldap-1.0-ser-0.9.0.diff 301 RMD160 3c68d75f7044caffa2c8794aa11cfda78c86f82e SHA1 b1dc7a4f1659d4f70d52a5d0411e2b7374a41de0 SHA256 fdf2367d1497f8954872730e79814d5f1d82639ab89573a86515a617c965fa76
 AUX ldaps-1.0-ser-0.9.0.diff 342 RMD160 e02341b9891bf15085a2444a5737f103c8b1d6a8 SHA1 82090421f7c154760f9e58b1ec6a5c144cb54b71 SHA256 5ca75d91eecfd568edf3df1f17ab3223a5897f5c559d14d461d4119440cfae4d
@@ -15,8 +18,15 @@ DIST ser-0.9.4_src.tar.gz 1888783 RMD160 9d2f58ab1ee49b96fb426de00c3ffefb848d4e6
 DIST ser-0.9.6_src.tar.gz 1846781 RMD160 7aab23c80f1b4bcc65b810a2387978aa104165c1 SHA1 9ce46896abf77f7a29d93012b810cd48e6da898d SHA256 d7870bdbb753deaa335a9ee0aae1852108fe904f74ed4ba903be9d7cd3a0b140
 DIST ser-0.9.7_src.tar.gz 1888122 RMD160 6f608e1f40edf43f7adf41416335b96c6964155b SHA1 ce1c6e444a3c20ce5da6a17a08807ff8a53c7650 SHA256 0fbbfd70d3e4b48665f7ae3ca0045a1421d3e1255ef8fc04b8fbe8168fb4e56f
 DIST silomail-1.0-ser-0.9.0.tar.gz 4762 RMD160 999d127a3ebad42cb207e2d2519e485588595f9a SHA1 4e07175aabaa153e01e5da16090261fe3ebc5ad1 SHA256 18d60d987246d4b188e8c2b78d721a43e61eb8c50402b19352edada2d2f98826
-EBUILD ser-0.9.4.ebuild 3829 RMD160 25d56a664140616299b4f396273ea84bc423d668 SHA1 5c8f021aa1c864d4553d93af09817df1bee12c41 SHA256 683ea3552fcd406ca36e30bbb37cf763da01436f76c82186cb1627153882b82c
-EBUILD ser-0.9.6.ebuild 4031 RMD160 f3dfc712308b59eb869b1207e96978a4fb75fd6e SHA1 e3462b18bc6f9b3383a9a813948992d43d619140 SHA256 4a33fffd38f2fe646bd8b7ed0ab7208692b83e3ad8be92fee5dc67abf284083f
-EBUILD ser-0.9.7.ebuild 4320 RMD160 d88ff97448c72f87117c6a2fd67dbc37579c7ad8 SHA1 0e920768e7d27834eae486fbc0d6ce499c2f5e67 SHA256 efd21032db462195e6f890c9eb19f426af564c8e9ccf93dc6e7b4a4b8a84ec7c
-MISC ChangeLog 4761 RMD160 35abe82b2dee98c288093ce9111647ffdba96128 SHA1 446ea154ab3225620ab0409f261871e67f982a3f SHA256 78979787439afca74dd16faf7812db65232d512d2d168a90946e0c243b89f504
+EBUILD ser-0.9.4.ebuild 3920 RMD160 841fda7947e6f50d66c5134870ecd9f49e8f2e77 SHA1 922665ee82d3a2dffa75967a1487b288b380dd28 SHA256 050a2deedc9d2a21644047555d753b24d348fb488276c63402a75a9a1e8a0192
+EBUILD ser-0.9.6.ebuild 4122 RMD160 cab5691e1bd369a0ad7f81c675a9804507d69721 SHA1 37c46d9ab8d8f66eac1c01f6c0336adf3eeb788e SHA256 091de39e37b6c3572ffe91797ba9315bd91b637f359f0e8d52928c6c5aeb579c
+EBUILD ser-0.9.7.ebuild 4411 RMD160 55d042d5756987a683fd95050f796e697c4a9e87 SHA1 f5f4cea0ca200d8046baa2975dcd94c581dbd990 SHA256 c262f0ad8c3515734d4a2eba4306fbe16ea6188189e6887bbfb123c8cde82785
+MISC ChangeLog 5010 RMD160 48772fff00eed4c4b0a722a5d50c2c60dc153d4f SHA1 d9735bd4032c23f1bd15059de9be438d27e78eb8 SHA256 3cab34d36763317f74d951f40088cf60a95af22b3b8863e9cc61465d6a38a9b9
 MISC metadata.xml 157 RMD160 cb900ea8bf389b8f6147746711462b5757752b16 SHA1 bbbbd897cfe8d8bac785b23bead8e185871055bd SHA256 6759dc127ff53f85505b9b455ba325e65015b694b1ec50eb99ddfc8903b967bf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhU90IACgkQ/ejvha5XGaMGegCfZgAFpJBDdqscmkTuxnSxWdWZ
+rgoAoLGRFMrO8jzpNVSF+qqKRhWc2tYk
+=u+lV
+-----END PGP SIGNATURE-----
diff --git a/net-misc/ser/ser-0.9.4.ebuild b/net-misc/ser/ser-0.9.4.ebuild
index 005416d4701f..8ab3aa91511a 100644
--- a/net-misc/ser/ser-0.9.4.ebuild
+++ b/net-misc/ser/ser-0.9.4.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/net-misc/ser/ser-0.9.4.ebuild,v 1.7 2008/05/21 18:59:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.4.ebuild,v 1.8 2008/06/15 11:04:25 zmedico Exp $
 
 inherit eutils flag-o-matic
 
@@ -156,8 +156,13 @@ src_install () {
 		${D}/usr/share/man/*/*
 }
 
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}"
+	previous_installed_version=$?
+}
+
 pkg_postinst() {
-	if has_version ${CATEGORY}/${PN}; then
+	if [[ $previous_installed_version = 0 ]] ; then
 		einfo "Changing permissions on ${ROOT}etc/ser"
 
 		chown -R root:ser ${ROOT}/etc/ser
diff --git a/net-misc/ser/ser-0.9.6.ebuild b/net-misc/ser/ser-0.9.6.ebuild
index 24689c473f10..b001d5cf005c 100644
--- a/net-misc/ser/ser-0.9.6.ebuild
+++ b/net-misc/ser/ser-0.9.6.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/net-misc/ser/ser-0.9.6.ebuild,v 1.5 2008/05/21 18:59:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.6.ebuild,v 1.6 2008/06/15 11:04:25 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -155,8 +155,13 @@ src_install () {
 		"${D}"/usr/share/man/*/*  || die
 }
 
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}"
+	previous_installed_version=$?
+}
+
 pkg_postinst() {
-	if has_version ${CATEGORY}/${PN}; then
+	if [[ $previous_installed_version = 0 ]] ; then
 		einfo "Changing permissions on ${ROOT}etc/ser"
 
 		chown -R root:ser "${ROOT}"/etc/ser
diff --git a/net-misc/ser/ser-0.9.7.ebuild b/net-misc/ser/ser-0.9.7.ebuild
index 4d1bb9cf1875..db9753253999 100644
--- a/net-misc/ser/ser-0.9.7.ebuild
+++ b/net-misc/ser/ser-0.9.7.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/net-misc/ser/ser-0.9.7.ebuild,v 1.2 2008/05/21 18:59:53 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.7.ebuild,v 1.3 2008/06/15 11:04:25 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -164,8 +164,13 @@ src_install () {
 		"${D}"/usr/share/man/*/*  || die
 }
 
+pkg_preinst() {
+	has_version "${CATEGORY}/${PN}"
+	previous_installed_version=$?
+}
+
 pkg_postinst() {
-	if has_version ${CATEGORY}/${PN}; then
+	if [[ $previous_installed_version = 0 ]] ; then
 		einfo "Changing permissions on ${ROOT}etc/ser"
 
 		chown -R root:ser "${ROOT}"/etc/ser