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)

12 files changed, 88 insertions, 23 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index 36b1db7ba6a2..63d629b3640e 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-epgsearch
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.34 2008/05/02 14:03:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.35 2008/06/15 07:29:36 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> vdr-epgsearch-0.9.19.ebuild,
+  vdr-epgsearch-0.9.20.ebuild, vdr-epgsearch-0.9.21.ebuild,
+  vdr-epgsearch-0.9.22.ebuild, vdr-epgsearch-0.9.23.ebuild,
+  vdr-epgsearch-0.9.24_beta19.ebuild, vdr-epgsearch-0.9.24_beta22.ebuild,
+  vdr-epgsearch-0.9.24_beta23.ebuild, vdr-epgsearch-0.9.24_beta26.ebuild,
+  vdr-epgsearch-0.9.24_rc2.ebuild, vdr-epgsearch-0.9.24.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   02 May 2008; Matthias Schwarzott <zzam@gentoo.org> Manifest:
   Fix tarball checksum another time.
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild
index ebd878886282..bbf8a9e8951b 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild,v 1.5 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild,v 1.6 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -32,9 +32,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild
index 7ce72074e29b..c6030c989252 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild,v 1.4 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild,v 1.5 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -32,9 +32,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild
index 7cdf8dde90f0..8103f1d00cdc 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild,v 1.3 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild,v 1.4 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -32,9 +32,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild
index 709a59bb04ee..ec72e75a92d8 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild,v 1.4 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild,v 1.5 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -35,9 +35,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
index 14253ca1616b..a09c0439c950 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild,v 1.3 2008/01/12 12:01:36 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild,v 1.4 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -35,9 +35,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
index 02d6a72abd14..fcea841d5f32 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild,v 1.1 2008/04/29 17:20:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -45,9 +45,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild
index 31a8edcfc7e9..6c4563fc1ea9 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild,v 1.2 2008/02/20 16:40:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild,v 1.3 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild
index f4c99db155a0..ea28ac708410 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild,v 1.1 2008/03/18 22:11:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild
index 2f7247c4fc48..bad020b9d304 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild,v 1.1 2008/03/24 15:19:11 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild
index 493477f6f1bd..235caa6ed71a 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild,v 1.1 2008/04/07 15:24:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild
index 7434b44be69b..a7e1b389a0ee 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.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-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild,v 1.1 2008/04/28 16:45:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -45,9 +45,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f