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

6 files changed, 44 insertions, 18 deletions

diff --git a/dev-libs/libotf/ChangeLog b/dev-libs/libotf/ChangeLog
index 9a1b69959917..f9f7b3c7f3ba 100644
--- a/dev-libs/libotf/ChangeLog
+++ b/dev-libs/libotf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libotf
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.35 2008/02/11 16:52:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/ChangeLog,v 1.36 2008/06/15 06:34:03 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> libotf-0.9.4.ebuild,
+  libotf-0.9.5.ebuild, libotf-0.9.6.ebuild, libotf-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.
 
   11 Feb 2008; Christoph Mende <angelos@gentoo.org> libotf-0.9.6.ebuild:
   Stable on amd64, bug #205218
diff --git a/dev-libs/libotf/Manifest b/dev-libs/libotf/Manifest
index bbaeaa645d8a..e6d8ce116c1a 100644
--- a/dev-libs/libotf/Manifest
+++ b/dev-libs/libotf/Manifest
@@ -5,16 +5,16 @@ DIST libotf-0.9.4.tar.gz 357518 RMD160 fd9af25dfffe481d5cbb5d8be1c47f37eaebe223
 DIST libotf-0.9.5.tar.gz 382482 RMD160 ea5178fbd1bc2efab85d76ded88bcfbde065eb35 SHA1 401da5edd006d2651280197b6c6800936a4d5811 SHA256 cd09e1206e6f070019f4265ba79e41f7717e4bc41679fe9b180dfda8cb7f91a2
 DIST libotf-0.9.6.tar.gz 382026 RMD160 3970e55bbf8807a3dc82e4eae32081ccd604bcbb SHA1 3dcb2d1f66f6584f6d222e04ab34710f869e22f3 SHA256 a6a93543ef8162d093a9dedcb12975d3e2c9fe0d13243617fc1366febdf863d7
 DIST libotf-0.9.7.tar.gz 382250 RMD160 f84aec315645b445808b45b29630e18b25edd097 SHA1 7fdb615a5571d05ad45fb0392a8f1fe700a7aeca SHA256 35769d53c1ca1dac003afb7b6ea6e044457e9c0899f5e81220f48dd68d67877f
-EBUILD libotf-0.9.4.ebuild 1062 RMD160 664d03f6a9dd35d38d011bceedf8228245eee9bd SHA1 f620f2463f01c3eae50d1618c9a52c1a19144ec6 SHA256 e109d070d40ffb3d77ae609c1b1a317c7405de20a17332431bad44ed3fff7303
-EBUILD libotf-0.9.5.ebuild 1155 RMD160 e64ad72694e61eff1faec8b9ba729b9089b01cef SHA1 9360b33a5ad8bdbef33f5d8350b732974d3a72df SHA256 16f44287be68bfc4a722c152e3c0f580604a6975811ac517330e0a737be16d4f
-EBUILD libotf-0.9.6.ebuild 1158 RMD160 7a2970584022dabddbf57b9390447095d0f9b0e0 SHA1 234a9f49f3384fee15b9cbc3b0bdcc33e5c404d2 SHA256 15e0d806d657f31a09877b07d5ac0452d3ed69a93f37ac3bb7c15877f3edf3c4
-EBUILD libotf-0.9.7.ebuild 1173 RMD160 a1db264024009f719d4c8bad93c3da5500abf512 SHA1 4c5cdb0fad45be7feee8b17c0480504af6de86ab SHA256 2fb4f8c7c442ed87cfa62f414c40e85da425c8e10b7dcc102c036eba5ce50f58
-MISC ChangeLog 3900 RMD160 4b1a7d878b6fbd4a8cc9e4ce5fc7d98dbf56a1fa SHA1 c2e718cec65a59c5f13f09141586e0ebd094ba26 SHA256 f41f500812ac96f4fa966eb1ac578956f57097c23198118ffe4e95d7897d8802
+EBUILD libotf-0.9.4.ebuild 1147 RMD160 61e8315b7edb3431d7ff57dca9ca64c77994b69c SHA1 c16ad8d90656ef1cbcc1ab86268eac88217b3483 SHA256 45c18c68480a62ad217365524fa63288ee1d3283dbe63a7e5800bea956a82853
+EBUILD libotf-0.9.5.ebuild 1240 RMD160 b39066387e1de4209d24367ed496bcfcc96ee0d8 SHA1 c7066e7b77acfd6bf8277cc148aba3ad1a1fea69 SHA256 3707673aa3334c0d1ab097cd9f9f3d30957ff45fb1b635764b7e3e294bcf3065
+EBUILD libotf-0.9.6.ebuild 1245 RMD160 66a1f0f9489054db6c7e5914a06063829b10785c SHA1 3916cb4e6186cda0080b4433a0ccd4a9f999d441 SHA256 befc11c9d53bda8076950ad7b692b7bf5ad10e7c8ac90599a4085a059566679a
+EBUILD libotf-0.9.7.ebuild 1258 RMD160 bcd33d9d83c324f57cbad8ca0b75e854557ddffd SHA1 311658e4413fdfa1b90e7856c08be1753d067c3f SHA256 3d986e74442ec4e0860041a7d266e2372d11013e317bc9cd2e0a5786badd1da9
+MISC ChangeLog 4180 RMD160 d27df3cec76ae18459aee11b46dec77d86efce63 SHA1 5a5d57d21b8d9ef9377c0c70f1ae36fbb53a1040 SHA256 1e6e06ac837cdb4d161120491c1cf33e02c8b1f4710b59f3a269c08b433ad051
 MISC metadata.xml 175 RMD160 4be49b8c0297a54a570715005c60f91a178807bf SHA1 80dc294bed90807462c2ef2bb5d8229a9b708f47 SHA256 5c2b5892c4a52e0f1585a34ed70e94042c3684a5f1021f077b2c5756d51120ce
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFHsH0+KhnDs22gwa8RAobNAKD0ZK48Q84JLvSQN16ttyiRRHlkzgCg8zM5
-7/n8tC1Dv8VtTR7KaR0YjrU=
-=6vYz
+iEYEARECAAYFAkhUt+MACgkQ/ejvha5XGaPlxQCfWQl1ca6YSPsqF/OKA+Xs2jSW
+RhMAniEeKZ7zlDGfoUi5AhQIjckg1xP8
+=aUZ8
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libotf/libotf-0.9.4.ebuild b/dev-libs/libotf/libotf-0.9.4.ebuild
index 1a1fd4437d4e..dc127a49931d 100644
--- a/dev-libs/libotf/libotf-0.9.4.ebuild
+++ b/dev-libs/libotf/libotf-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/dev-libs/libotf/libotf-0.9.4.ebuild,v 1.3 2008/02/02 22:19:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.4.ebuild,v 1.4 2008/06/15 06:34:03 zmedico Exp $
 
 DESCRIPTION="Library for handling OpenType fonts (OTF)"
 HOMEPAGE="http://www.m17n.org/libotf/"
@@ -31,8 +31,13 @@ src_install() {
 	dodoc AUTHORS INSTALL NEWS README ChangeLog
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.3"
+	previous_less_than_0_9_3=$?
+}
+
 pkg_postinst() {
-	if has_version '<dev-libs/libotf-0.9.3' ; then
+	if [[ $previous_less_than_0_9_3 = 0 ]] ; then
 
 	ewarn
 	ewarn "Shared library extension has been changed. You may need to recompile"
diff --git a/dev-libs/libotf/libotf-0.9.5.ebuild b/dev-libs/libotf/libotf-0.9.5.ebuild
index 24afa39de029..d95d76d4defe 100644
--- a/dev-libs/libotf/libotf-0.9.5.ebuild
+++ b/dev-libs/libotf/libotf-0.9.5.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/dev-libs/libotf/libotf-0.9.5.ebuild,v 1.2 2008/02/02 22:19:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.5.ebuild,v 1.3 2008/06/15 06:34:03 zmedico Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -38,8 +38,13 @@ src_install() {
 	dodoc AUTHORS INSTALL NEWS README ChangeLog
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.3"
+	previous_less_than_0_9_3=$?
+}
+
 pkg_postinst() {
-	if has_version '<dev-libs/libotf-0.9.3' ; then
+	if [[ $previous_less_than_0_9_3 = 0 ]] ; then
 		ewarn
 		ewarn "Shared library extension has been changed. You may need to recompile"
 		ewarn "everything depending on this library (in short, please remerge m17n-lib"
diff --git a/dev-libs/libotf/libotf-0.9.6.ebuild b/dev-libs/libotf/libotf-0.9.6.ebuild
index be10fd278591..1a3232c3d082 100644
--- a/dev-libs/libotf/libotf-0.9.6.ebuild
+++ b/dev-libs/libotf/libotf-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/dev-libs/libotf/libotf-0.9.6.ebuild,v 1.8 2008/02/11 16:52:08 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.6.ebuild,v 1.9 2008/06/15 06:34:03 zmedico Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -39,8 +39,13 @@ src_install() {
 	dodoc AUTHORS NEWS README ChangeLog
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.3"
+	previous_less_than_0_9_3=$?
+}
+
 pkg_postinst() {
-	if has_version '<dev-libs/libotf-0.9.3' ; then
+	if [[ $previous_less_than_0_9_3 = 0 ]] ; then
 		ewarn
 		ewarn "Shared library extension has been changed. You may need to recompile"
 		ewarn "everything depending on this library (in short, please remerge m17n-lib"
diff --git a/dev-libs/libotf/libotf-0.9.7.ebuild b/dev-libs/libotf/libotf-0.9.7.ebuild
index 5404d744fd40..dcdfa5cd7739 100644
--- a/dev-libs/libotf/libotf-0.9.7.ebuild
+++ b/dev-libs/libotf/libotf-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/dev-libs/libotf/libotf-0.9.7.ebuild,v 1.3 2008/02/02 22:19:32 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libotf/libotf-0.9.7.ebuild,v 1.4 2008/06/15 06:34:03 zmedico Exp $
 
 WANT_AUTOMAKE=latest
 WANT_AUTOCONF=latest
@@ -39,8 +39,13 @@ src_install() {
 	dodoc AUTHORS NEWS README ChangeLog
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.3"
+	previous_less_than_0_9_3=$?
+}
+
 pkg_postinst() {
-	if has_version '<dev-libs/libotf-0.9.3' ; then
+	if [[ $previous_less_than_0_9_3 = 0 ]] ; then
 		ewarn
 		ewarn "Shared library extension has been changed. You may need to recompile"
 		ewarn "everything depending on this library (in short, please remerge m17n-lib"