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, 43 insertions, 12 deletions

diff --git a/net-misc/freenet6/ChangeLog b/net-misc/freenet6/ChangeLog
index 1939ccc6b0d3..5b4347169750 100644
--- a/net-misc/freenet6/ChangeLog
+++ b/net-misc/freenet6/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/freenet6
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.32 2008/04/29 12:49:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/ChangeLog,v 1.33 2008/06/15 10:44:02 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> freenet6-4.2.2.ebuild,
+  freenet6-5.0.ebuild, freenet6-5.1.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   29 Apr 2008; Raúl Porcel <armin76@gentoo.org> freenet6-5.0.ebuild:
   sparc stable wrt #211360
diff --git a/net-misc/freenet6/Manifest b/net-misc/freenet6/Manifest
index c1e8197a89d9..8c1f17bc48ca 100644
--- a/net-misc/freenet6/Manifest
+++ b/net-misc/freenet6/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freenet6-4.2.2-noretry.patch 1273 RMD160 42dc48455d43ae02cf0f59bdf8c05fd85f5e09f7 SHA1 f8d9a3bb5812353312bf451b6ae97f6a58eda7b0 SHA256 8e9ce8e4fbaf92339c15c56085e3d8c41677f08645f1fa869882038721b12e2f
 AUX gw6c.conf 8536 RMD160 633eb8d49378459d93931415be401babf88ef42c SHA1 dde098066da1014bb1374d2d5b18de200105f35e SHA256 8da6f62ed5164d54d272ae9d380f1b2387f2ad819ffcd8f52349beeca44c7b1c
 AUX gw6c.rc 644 RMD160 89bcf7d0329c59eaee58f5c98924c4c1968df6e9 SHA1 643f89719a0141b271a4808281cf79da757f3f73 SHA256 cafd899ebd4bb315b0491e47b3a2a824351e3ff61553f42dd4d5ffdb93ffe9ac
 DIST gw6c-5_0-RELEASE-src.tar.gz 2441593 RMD160 737e4d0cc74d78df9543715f8a5f0e3c9a11c699 SHA1 aad5d89ac87ef50fb930d854c7f97277f83167b4 SHA256 431e59a6590f0826f1cb34a6319bd69d024ca89e36f8578a2befe039a489e894
 DIST gw6c-5_1-RELEASE-src.tar.gz 1055230 RMD160 bb507ce6e56e9fd71363d2fdd27ba61c04ab125f SHA1 1ffab56a93d2271001f257d4dcaea82c38aa81f9 SHA256 960a6eceebc685c0b36d75a28d3ac576424837e34ddb7d6ee43334c5c3e15b1f
 DIST gw6c4_2_2src.tar.gz 113738 RMD160 d918e08bf1670a2e875880bdef582ad2a971ed38 SHA1 9837e29d5ca4236f244d1507716c815728623026 SHA256 938021f16f88f984c33f714b3f7a75c54927e0d63f1a0bdfc723a03758e9ee73
-EBUILD freenet6-4.2.2.ebuild 1551 RMD160 14fb9719e10d249cec396d4622c01766817e6e23 SHA1 a8dbccbdddb94cac3801c3b3ad786adef98bf090 SHA256 bdcf6ee0b2e33220a361378cf86017b9d131754f5a99f61ce552fa88356cd67b
-EBUILD freenet6-5.0.ebuild 1564 RMD160 93d7f5aa54f0a4c62d284fd9a5fe9c2e66abfadd SHA1 2e03c11b1a6f47855d52ac55907fb3f0dc90cbe3 SHA256 6ec6dd6b76c583e46631d15b8fe59683fff8c8280ac37c1d76be91375190a020
-EBUILD freenet6-5.1.ebuild 2386 RMD160 80f747b2a5069bf9d3e2e9458eb672fee4bc1f1d SHA1 157c1a5a86d95ea6b9c773158b8c886e15c6ba52 SHA256 1b2f1e5f3096f0242d933ea97d1af6262f31738297c12a7b75bbbe1445ea3ef8
-MISC ChangeLog 4227 RMD160 61a20416308a50a52c3283835a13501c5695c432 SHA1 6056540f0cccd6d4e35535879532e941713189f3 SHA256 33fe432f7aaeb0fa337f5919cd804babf3be28b5e9d23d42dcdd650240549128
+EBUILD freenet6-4.2.2.ebuild 1620 RMD160 d46f015e0dcfc2f5d62ca979309e8dfd87ea02ae SHA1 c5c0ec6bfedce085869f20ca29541af0a838f5ca SHA256 80e53b1ea317b847e7174878e4f11740e677778576036d18c44593ebc493f6d5
+EBUILD freenet6-5.0.ebuild 1633 RMD160 415202f9badc666b33ea1b2e0a6b2e25a9d5f54a SHA1 ba5925de1e7215cd2f38dfbc08845e4ff404d449 SHA256 6fed189f2e7a7056c1a0285ed5f7e10bfec5953060cf014dfe45b05a4f256a69
+EBUILD freenet6-5.1.ebuild 2454 RMD160 01d7ab4b41f3713d78db7cd19986adc2251d62ad SHA1 a2ef6a2afc171a50c301a0399b8746ae801568a6 SHA256 dfd4b21ab4788680d1f79d733e07c80e6c13d4b5f2cb30b961aa0b6e892dbbf9
+MISC ChangeLog 4488 RMD160 925b9f0d7e898fb67767b160c25e4ad9e46f9a96 SHA1 f732a8dbddd0315dec37ac9aeaa202357e97286e SHA256 dc0ff20c7c046d62cccadf2920e40848f6cd0b165dfb5161414b76c88dbc82d7
 MISC metadata.xml 348 RMD160 831527825fdc6b58538bb671987c0a562e1559df SHA1 2517554158e3a9d0cd11e7a8ecbe4fa1843a170f SHA256 9a455a8b1ebafab91dcd8d5a1c0d3cc61fc75abc59ad2988d7118032f8309730
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhU8noACgkQ/ejvha5XGaMPRgCdEOeS98EL0M+JyDQSC0FlS39H
+E7oAoIqJFf/l39Xh7JVMSdVYSFN2xO4z
+=cDsv
+-----END PGP SIGNATURE-----
diff --git a/net-misc/freenet6/freenet6-4.2.2.ebuild b/net-misc/freenet6/freenet6-4.2.2.ebuild
index c8b52c76dc57..c52ebdfb0e84 100644
--- a/net-misc/freenet6/freenet6-4.2.2.ebuild
+++ b/net-misc/freenet6/freenet6-4.2.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/net-misc/freenet6/freenet6-4.2.2.ebuild,v 1.7 2007/06/16 03:13:45 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-4.2.2.ebuild,v 1.8 2008/06/15 10:44:02 zmedico Exp $
 
 inherit eutils versionator
 
@@ -43,8 +43,13 @@ src_install() {
 	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1*"
+	upgrade_from_1_x=$?
+}
+
 pkg_postinst() {
-	if has_version '=net-misc/freenet6-1*' ; then
+	if [[ $upgrade_from_1_x = 0 ]] ; then
 		ewarn "Warning: you are upgrading from an older version"
 		ewarn "The configuration file has been renamed to gw6c.conf"
 		ewarn "Remember to port your personal settings from tspc.conf to it"
diff --git a/net-misc/freenet6/freenet6-5.0.ebuild b/net-misc/freenet6/freenet6-5.0.ebuild
index a3eeeb441e39..e9306e9c8f7b 100644
--- a/net-misc/freenet6/freenet6-5.0.ebuild
+++ b/net-misc/freenet6/freenet6-5.0.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/freenet6/freenet6-5.0.ebuild,v 1.6 2008/04/29 12:49:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.0.ebuild,v 1.7 2008/06/15 10:44:02 zmedico Exp $
 
 inherit eutils versionator
 
@@ -38,8 +38,13 @@ src_install() {
 	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1*"
+	upgrade_from_1_x=$?
+}
+
 pkg_postinst() {
-	if has_version '=net-misc/freenet6-1*' ; then
+	if [[ $upgrade_from_1_x = 0 ]] ; then
 		ewarn "Warning: you are upgrading from an older version"
 		ewarn "The configuration file has been renamed to gw6c.conf"
 		ewarn "Remember to port your personal settings from tspc.conf to it"
diff --git a/net-misc/freenet6/freenet6-5.1.ebuild b/net-misc/freenet6/freenet6-5.1.ebuild
index 5d7ab796c712..d890a07348ae 100644
--- a/net-misc/freenet6/freenet6-5.1.ebuild
+++ b/net-misc/freenet6/freenet6-5.1.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/freenet6/freenet6-5.1.ebuild,v 1.2 2008/02/27 10:07:38 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freenet6/freenet6-5.1.ebuild,v 1.3 2008/06/15 10:44:02 zmedico Exp $
 
 inherit eutils versionator toolchain-funcs
 
@@ -64,8 +64,13 @@ src_install() {
 	doman man/{man5/gw6c.conf.5,man8/gw6c.8}
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1*"
+	upgrade_from_1_x=$?
+}
+
 pkg_postinst() {
-	if has_version '=net-misc/freenet6-1*' ; then
+	if [[ $upgrade_from_1_x = 0 ]] ; then
 		ewarn "Warning: you are upgrading from an older version"
 		ewarn "The configuration file has been renamed to gw6c.conf"
 		ewarn "Remember to port your personal settings from tspc.conf to it"