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)

6 files changed, 28 insertions, 11 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 35c7823b57bc..ec0d726ed9fb 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.313 2008/06/09 21:37:05 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.314 2008/06/15 01:14:09 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> cups-1.2.12-r4.ebuild,
+  cups-1.2.12-r7.ebuild, cups-1.2.12-r8.ebuild, cups-1.3.7-r1.ebuild,
+  cups-1.3.7-r2.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
 *cups-1.3.7-r2 (09 Jun 2008)
 
diff --git a/net-print/cups/cups-1.2.12-r4.ebuild b/net-print/cups/cups-1.2.12-r4.ebuild
index 5b01f8331593..adf712bcfb32 100644
--- a/net-print/cups/cups-1.2.12-r4.ebuild
+++ b/net-print/cups/cups-1.2.12-r4.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-print/cups/cups-1.2.12-r4.ebuild,v 1.5 2008/04/05 13:42:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r4.ebuild,v 1.6 2008/06/15 01:14:09 zmedico Exp $
 
 WANT_AUTOMAKE=latest
 
@@ -180,6 +180,8 @@ src_install() {
 pkg_preinst() {
 	# cleanups
 	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-*
+	has_version "=${CATEGORY}/${PN}-1.1*"
+	upgrade_from_1_1=$?
 }
 
 pkg_postinst() {
@@ -205,7 +207,7 @@ pkg_postinst() {
 		ewarn
 		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
 	fi
-	if has_version =net-print/cups-1.1*; then
+	if [[ $upgrade_from_1_1 = 0 ]] ; then
 		ewarn
 		ewarn "The configuration changed with cups-1.2, you may want to save the old"
 		ewarn "one and start from scratch:"
diff --git a/net-print/cups/cups-1.2.12-r7.ebuild b/net-print/cups/cups-1.2.12-r7.ebuild
index 9326a443f41f..9da17d58e4b0 100644
--- a/net-print/cups/cups-1.2.12-r7.ebuild
+++ b/net-print/cups/cups-1.2.12-r7.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-print/cups/cups-1.2.12-r7.ebuild,v 1.4 2008/04/05 13:42:26 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r7.ebuild,v 1.5 2008/06/15 01:14:09 zmedico Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -180,6 +180,8 @@ src_install() {
 pkg_preinst() {
 	# cleanups
 	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-*
+	has_version "=${CATEGORY}/${PN}-1.1*"
+	upgrade_from_1_1=$?
 }
 
 pkg_postinst() {
@@ -205,7 +207,7 @@ pkg_postinst() {
 		ewarn
 		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
 	fi
-	if has_version =net-print/cups-1.1*; then
+	if [[ $upgrade_from_1_1 = 0 ]] ; then
 		ewarn
 		ewarn "The configuration changed with cups-1.2, you may want to save the old"
 		ewarn "one and start from scratch:"
diff --git a/net-print/cups/cups-1.2.12-r8.ebuild b/net-print/cups/cups-1.2.12-r8.ebuild
index 74a9a99f6057..20ce86fc8596 100644
--- a/net-print/cups/cups-1.2.12-r8.ebuild
+++ b/net-print/cups/cups-1.2.12-r8.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-print/cups/cups-1.2.12-r8.ebuild,v 1.8 2008/04/17 11:15:31 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.2.12-r8.ebuild,v 1.9 2008/06/15 01:14:09 zmedico Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -182,6 +182,8 @@ src_install() {
 pkg_preinst() {
 	# cleanups
 	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/${PN}-*
+	has_version "=${CATEGORY}/${PN}-1.1*"
+	upgrade_from_1_1=$?
 }
 
 pkg_postinst() {
@@ -207,7 +209,7 @@ pkg_postinst() {
 		ewarn
 		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on"
 	fi
-	if has_version =net-print/cups-1.1*; then
+	if [[ $upgrade_from_1_1 = 0 ]] ; then
 		ewarn
 		ewarn "The configuration changed with cups-1.2, you may want to save the old"
 		ewarn "one and start from scratch:"
diff --git a/net-print/cups/cups-1.3.7-r1.ebuild b/net-print/cups/cups-1.3.7-r1.ebuild
index 4539483567c4..c6f1f910f81e 100644
--- a/net-print/cups/cups-1.3.7-r1.ebuild
+++ b/net-print/cups/cups-1.3.7-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/net-print/cups/cups-1.3.7-r1.ebuild,v 1.6 2008/05/18 14:37:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.7-r1.ebuild,v 1.7 2008/06/15 01:14:09 zmedico Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -232,6 +232,8 @@ src_install() {
 pkg_preinst() {
 	# cleanups
 	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2=$?
 }
 
 pkg_postinst() {
@@ -253,7 +255,7 @@ pkg_postinst() {
 		echo
 	fi
 
-	if has_version =net-print/cups-1.2* ; then
+	if [[ $upgrade_from_1_2 = 0 ]] ; then
 		echo
 		ewarn "You have upgraded from an older cups version. Please make sure"
 		ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW."
diff --git a/net-print/cups/cups-1.3.7-r2.ebuild b/net-print/cups/cups-1.3.7-r2.ebuild
index fe8046aca3f1..e219bb610bde 100644
--- a/net-print/cups/cups-1.3.7-r2.ebuild
+++ b/net-print/cups/cups-1.3.7-r2.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-print/cups/cups-1.3.7-r2.ebuild,v 1.1 2008/06/09 21:37:06 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.7-r2.ebuild,v 1.2 2008/06/15 01:14:09 zmedico Exp $
 
 inherit autotools eutils flag-o-matic multilib pam
 
@@ -238,6 +238,8 @@ src_install() {
 pkg_preinst() {
 	# cleanups
 	[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-*
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2=$?
 }
 
 pkg_postinst() {
@@ -259,7 +261,7 @@ pkg_postinst() {
 		echo
 	fi
 
-	if has_version =net-print/cups-1.2* ; then
+	if [[ $upgrade_from_1_2 = 0 ]] ; then
 		echo
 		ewarn "You have upgraded from an older cups version. Please make sure"
 		ewarn "to run \"etc-update\" and \"revdep-rebuild\" NOW."