Bug #226505 - For compatibility with phase execution order in

>=portage-2.1.5, call has_version inside pkg_preinst instead of
pkg_postinst.
(Portage version: 2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686)

4 files changed, 29 insertions, 8 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/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"