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

4 files changed, 36 insertions, 10 deletions

diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index 77f132c1aa61..6eabad21726e 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libexif
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.94 2007/12/19 16:23:53 armin76 Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.95 2008/06/14 18:18:51 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> libexif-0.6.16.ebuild,
+  libexif-0.6.16-r1.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   19 Dec 2007; Raúl Porcel <armin76@gentoo.org> libexif-0.6.16-r1.ebuild:
   alpha/ia64/x86 stable wrt security #202350
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index fc2db2023d70..adc53b6246bd 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,8 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libexif-0.6.13-pkgconfig.patch 402 RMD160 269822b19acf52a1be773e64fcf72f5480155e89 SHA1 82646a34866ebaf2c9cb47c925f7fca0b17c501d SHA256 9986246ab56eb294bd93eada0847f3141beed90f23f5711f4ff0f696f38f2def
 AUX libexif-CVE-2007-6351.patch 405 RMD160 974706cbb2683f62b9da5a7307fac87dedab87df SHA1 02ec666c10de3c9f9fe540e679c58d1dd2650cc3 SHA256 0d01009cedb6e01f39072b0f4662fb51aeb71f52e5db6dea2e9aeebacc2f02f5
 AUX libexif-CVE-2007-6352.patch 691 RMD160 19ebfba5d7db6c152194f924bf68780e8d49b13d SHA1 9887067d4ce307cc535658cfaf1e8bc4a4985646 SHA256 6686731b147f789a8d1e36550175ff3ba2308f01b1656a734a753e01632692cc
 DIST libexif-0.6.16.tar.bz2 691528 RMD160 3754861ad0550f9d77b0aa745dcb3d394ec658ed SHA1 4fea28a05496b3c7075ca5f619439340be534a3f SHA256 db6885d5e40e3a273ff8bb9708ab739c8ace3c5abdd75509eec8ea31a31aac43
-EBUILD libexif-0.6.16-r1.ebuild 1957 RMD160 6a15e5ea4e7d84ecd6c55f2abf22594ec860adf8 SHA1 aeb1bf06c587409c81bf90f815cfece82c26abad SHA256 d7a30bf652e1cc796d9419a61bfca50e468299f2e5f0b467e0b7292dfc9bc2f5
-EBUILD libexif-0.6.16.ebuild 1862 RMD160 5addd1174d21923102871d491a2c915c707b2f7f SHA1 d650b4377cdc4b8e806dea78e4871a752512e7a4 SHA256 9a696b46e21f7b0c05c2414eee81e4f0e64b14b74f8fd895ac5977add9ec95cf
-MISC ChangeLog 14357 RMD160 320079cf183fac77cc7c8bdaba81dd2eef8dc819 SHA1 7f956ad2f42c26cf724763eb03c05e5e9dc31ea0 SHA256 55cca66b223db61fd139d71a33f6674078684badbaf51f39d45dc59d535b1f40
+EBUILD libexif-0.6.16-r1.ebuild 2051 RMD160 ec8f80d0993cf0291ed854c8820c4d5eaf6be726 SHA1 0a64397bc62bcf58c04f44998a132f07f4d304f1 SHA256 5808c192c9da7d781af6fc9fca80eaba13cbc693bdeea30fe47ed36c9c85264b
+EBUILD libexif-0.6.16.ebuild 1952 RMD160 01e4139e624ee64d2f5cf315b86db3847731b300 SHA1 a3a72ed191d711c38c55b9cc22fc9df7dacfd839 SHA256 6d6d93f1cc5972b985c7e8a3522b966b3ebe815b78618bc9b5ec49f6a3f5cf79
+MISC ChangeLog 14602 RMD160 6e52e32d4d37c0010c389f706f112c2ad5a52e33 SHA1 dad2ac1d6833b382c6aa9c6832d2b968123c50b7 SHA256 7fdf988d8b1f41218b158b8bea45423ddf6c779cb058681989b90b460f2c185d
 MISC metadata.xml 259 RMD160 d1f5ea37202987c54db9697175a55e5609386654 SHA1 d7234631415b27fa166f13d440f0ea6e4d3f1044 SHA256 14f1bab6a31d434eda6319b2783239e50179d75501edb6e255bb6c3e665418cf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhUC5EACgkQ/ejvha5XGaNzhgCfZTLy9nrar8ltu7xl82JoWa8P
+HoMAnio3X9gddWGqNdwGcRW4HWX4ttTV
+=wwhz
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libexif/libexif-0.6.16-r1.ebuild b/media-libs/libexif/libexif-0.6.16-r1.ebuild
index 42e9f0f338a6..54404cd4b3d8 100644
--- a/media-libs/libexif/libexif-0.6.16-r1.ebuild
+++ b/media-libs/libexif/libexif-0.6.16-r1.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/media-libs/libexif/libexif-0.6.16-r1.ebuild,v 1.7 2008/01/10 08:52:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.16-r1.ebuild,v 1.8 2008/06/14 18:18:51 zmedico Exp $
 
 inherit eutils libtool
 
@@ -54,8 +54,13 @@ src_install() {
 	use nls || rm -rf "${D}usr/share/locale"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.6.13-r2"
+	previous_less_than_0_6_13_r2=$?
+}
+
 pkg_postinst() {
-	if has_version '<media-libs/libexif-0.6.13-r2'; then
+	if [[ $previous_less_than_0_6_13_r2 = 0 ]] ; then
 		elog "If you are upgrading from a version of libexif older than 0.6.13-r2,"
 		elog "you will need to do the following to rebuild dependencies:"
 		elog "# revdep-rebuild --soname libexif.so.9"
diff --git a/media-libs/libexif/libexif-0.6.16.ebuild b/media-libs/libexif/libexif-0.6.16.ebuild
index b7fc859d0487..5e56cabff539 100644
--- a/media-libs/libexif/libexif-0.6.16.ebuild
+++ b/media-libs/libexif/libexif-0.6.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.16.ebuild,v 1.12 2007/12/18 17:33:40 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.6.16.ebuild,v 1.13 2008/06/14 18:18:51 zmedico Exp $
 
 inherit eutils libtool
 
@@ -52,8 +52,13 @@ src_install() {
 	use nls || rm -rf "${D}usr/share/locale"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.6.13-r2"
+	previous_less_than_0_6_13_r2=$?
+}
+
 pkg_postinst() {
-	if has_version '<media-libs/libexif-0.6.13-r2'; then
+	if [[ $previous_less_than_0_6_13_r2 = 0 ]] ; then
 		elog "If you are upgrading from a version of libexif older than 0.6.13-r2,"
 		elog "you will need to do the following to rebuild dependencies:"
 		elog "# revdep-rebuild --soname libexif.so.9"