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, 31 insertions, 13 deletions

diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog
index d334cd971139..3acdc9b65516 100644
--- a/media-libs/pdflib/ChangeLog
+++ b/media-libs/pdflib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/pdflib
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.99 2008/03/06 23:48:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.100 2008/06/14 17:49:57 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> pdflib-7.0.2.ebuild,
+  pdflib-7.0.2_p8.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   06 Mar 2008; Ryan Hill <dirtyepic@gentoo.org>
   +files/pdflib-7.0.2_p8-gcc-4.3.patch, pdflib-7.0.2_p8.ebuild:
diff --git a/media-libs/pdflib/Manifest b/media-libs/pdflib/Manifest
index 3ed25496b00a..d79831dbbe6b 100644
--- a/media-libs/pdflib/Manifest
+++ b/media-libs/pdflib/Manifest
@@ -10,14 +10,14 @@ DIST PDFlib-Lite-7.0.2.tar.gz 5478372 RMD160 098d2950f01789eadbdf49c048eac4e740a
 DIST PDFlib-Lite-7.0.2p8.tar.gz 5788364 RMD160 3d48885d1d9bf7e72bba72ed2b8d6ca1e3200177 SHA1 696783069b5b599a1f2bf88de1930cee60af448f SHA256 b76b4cee4b2d770de80c4b28f8b5611b3bd9dc58098e50ef3d70701369088cfd
 EBUILD pdflib-6.0.3-r1.ebuild 3552 RMD160 a281102b22eeeec37c05b266c2e33cc91d17309f SHA1 17d8260eaa5673975746d884558a37e4938ea38c SHA256 efe62e62bed82aed86eb8f3753a77086f8a47c73c107e461ee52487ddd11e2cf
 EBUILD pdflib-7.0.1.ebuild 3999 RMD160 890af61e59660985d689b0e133905940e6cbedbd SHA1 7bccd63614223aa46322fad090ad7c8222025451 SHA256 60a56ddd390b486cb5dcec23c07196c01f5f52dcd869aa099fddec92063230d7
-EBUILD pdflib-7.0.2.ebuild 3067 RMD160 3f51a95cfb5c5f9b79254385f909635bd9b28535 SHA1 cb7e566071d92299a5f21e66daf7b9456227b1af SHA256 891869151fae1b74f137d41e5acaf2396f5569da43c6e51c60e31053a0751d5f
-EBUILD pdflib-7.0.2_p8.ebuild 3922 RMD160 c4c1c2998bd1166fddb1bb7407925838607b3219 SHA1 7e224d312c2550c95af9a1b9a8c2e20a3ea8b7aa SHA256 59800d2285dd58208adbdf042e28e3136dbcbcd72c0e2f61c5b31d1e2220f671
-MISC ChangeLog 13620 RMD160 e916127d9e3518738e4b115aad88fa6e02edb89a SHA1 203c832cf21585cd86cd966fd29a1f1cc23a8670 SHA256 102aceb255423c4fa233e0cad1a523e94e50ebb442c89ec2b7c118737c944fbb
+EBUILD pdflib-7.0.2.ebuild 3179 RMD160 53de8ce76ea0b4612e3329fce296558a119a5b0a SHA1 bdb5cefe72cfc382dac38153920297ec7e4debe8 SHA256 f6dd13a00c8b754d6fccfd20e17f8b44a06027a8d9f22ce4515a38e1b016a58b
+EBUILD pdflib-7.0.2_p8.ebuild 4031 RMD160 eb6490c39d16da9a62626af90ce02e1c051802dd SHA1 936ad8a45f5c34d9a85fe4c1b61b2c5e591e0366 SHA256 01a97d539faf666a922e46a34bd8375d39a5b7397effd6aeb59afadc629fda88
+MISC ChangeLog 13860 RMD160 62ce94527ee25eec7248fc71eb0585086c3e1f6e SHA1 8355e30201c0c136f42e9f976354cefeb50aed09 SHA256 38f669d932b85252736e6caa59bb734e079cc40ad1f8c85814cad2e77caf7462
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFH0ILtiqiDRvmkBmIRAps8AKCXVEA42ersYT6gPC4Nqgk3o3ghHQCePzLZ
-cLfz0190YtqJMvC1YVeekjA=
-=SnFZ
+iEYEARECAAYFAkhUBMwACgkQ/ejvha5XGaMazwCgyFiDp+mRZbN3wHBtUVpQE3Sa
+nNAAoOycmZDkY09nXKPjtvZqfM+bKMQH
+=17ig
 -----END PGP SIGNATURE-----
diff --git a/media-libs/pdflib/pdflib-7.0.2.ebuild b/media-libs/pdflib/pdflib-7.0.2.ebuild
index 382488cf27fc..f27ec75e5add 100644
--- a/media-libs/pdflib/pdflib-7.0.2.ebuild
+++ b/media-libs/pdflib/pdflib-7.0.2.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/pdflib/pdflib-7.0.2.ebuild,v 1.10 2007/12/11 23:53:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-7.0.2.ebuild,v 1.11 2008/06/14 17:49:57 zmedico Exp $
 
 inherit java-pkg-opt-2 flag-o-matic libtool python perl-module multilib
 
@@ -114,8 +114,14 @@ src_install() {
 	fi
 }
 
+pkg_preinst () {
+	perl-module_pkg_preinst
+	has_version "<${CATEGORY}/${PN}-7.0.1"
+	previous_less_than_7_0_1=$?
+}
+
 pkg_postinst() {
-	if has_version "<media-libs/pdflib-7.0.1" ; then
+	if [[ $previous_less_than_7_0_1 = 0 ]] ; then
 		ewarn "Please run revdep-rebuild now! All packages that linked with"
 		ewarn "previous versions of PDFLib will no longer work unless you"
 		ewarn "run it."
diff --git a/media-libs/pdflib/pdflib-7.0.2_p8.ebuild b/media-libs/pdflib/pdflib-7.0.2_p8.ebuild
index 640041398214..67ab0fb9d044 100644
--- a/media-libs/pdflib/pdflib-7.0.2_p8.ebuild
+++ b/media-libs/pdflib/pdflib-7.0.2_p8.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/pdflib/pdflib-7.0.2_p8.ebuild,v 1.8 2008/03/06 23:48:44 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-7.0.2_p8.ebuild,v 1.9 2008/06/14 17:49:57 zmedico Exp $
 
 EAPI="1"
 
@@ -137,8 +137,14 @@ src_install() {
 	fi
 }
 
+pkg_preinst () {
+	perl-module_pkg_preinst
+	has_version "<${CATEGORY}/${PN}-7.0.1"
+	previous_less_than_7_0_1=$?
+}
+
 pkg_postinst() {
-	if has_version "<media-libs/pdflib-7.0.1" ; then
+	if [[ $previous_less_than_7_0_1 = 0 ]] ; then
 		ewarn "Please run revdep-rebuild now! All packages that linked with"
 		ewarn "previous versions of PDFLib will no longer work unless you"
 		ewarn "run it."