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

9 files changed, 68 insertions, 26 deletions

diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog
index 8b2d9c1e867c..0157f5825f18 100644
--- a/media-video/vdr/ChangeLog
+++ b/media-video/vdr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/vdr
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.115 2008/05/21 13:46:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.116 2008/06/15 09:00:01 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> vdr-1.4.6.ebuild,
+  vdr-1.4.7-r10.ebuild, vdr-1.6.0.ebuild, vdr-1.6.0-r1.ebuild,
+  vdr-1.6.0-r2.ebuild, vdr-1.6.0_p1.ebuild, vdr-1.6.0_p1-r1.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
 *vdr-1.6.0_p1-r1 (21 May 2008)
 
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index a88bbddbda4a..2a127c676512 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -19,19 +19,19 @@ DIST vdr-1.4.7.tar.bz2 560888 RMD160 0e7a0d1cf133ee5e168afb6e2374e2ee6c229fcf SH
 DIST vdr-1.6.0-1.diff 6750 RMD160 8fcb1557d50b6d70d8791f7a67c96b4c12b1067a SHA1 68a4a9aab1e5179b5d9725481e09bc1213d1aff2 SHA256 82fc1f30f8b13568478e51c57d117d8c1c8c644aee9416a3c80f76b6a5b209eb
 DIST vdr-1.6.0.tar.bz2 593172 RMD160 b190901fcaa5507be37547dfd5cba10887316b09 SHA1 203a03ce4a39e8c70e0a64d7d94b7f5f17f03e7d SHA256 9993a6c20b35f19d46f63c13f2f5fc71036d27ee09bcf9c7e57474ba3b2cb8e6
 DIST vdr-extensions-patch-55-atsc.tar.bz2 32793 RMD160 685d9e7a9409a2465e7d8bad3e9a9e72b56f9411 SHA1 68aed71209630ef69b0be0e16a927076b375f3fc SHA256 7889817f005f9640946b4909763e1598f54897152be36064d817fbcab94dac3f
-EBUILD vdr-1.4.6.ebuild 5806 RMD160 811c6325a8aee53529233eeda3500f54f485b2ab SHA1 06039327640a87fb67b20cc391f60adc4adb3ea5 SHA256 1b81be2fa4c5249f3a89bc55759777fa6db60eeb37a1a83b1e7e9007bce7e6fa
-EBUILD vdr-1.4.7-r10.ebuild 9281 RMD160 e9ecf199b46c4d07c84419618be6fae12e7230d3 SHA1 10ef5bbb120e99e66ace273010d1c302d6d001c0 SHA256 311bcc559fe102783fc2b4b8512c8596b72fd76b03844ddd4dd09226269d59e7
-EBUILD vdr-1.6.0-r1.ebuild 9528 RMD160 fe112640959a65ac03d4c6dfb8c997d8c801d4b6 SHA1 03eef553ceaf22cae3d1a2ce2fcb9adf12c6c326 SHA256 5f0bf32b2e7639efd8fe916728da6c7dab190314f96284d1d0360fa073abe5fd
-EBUILD vdr-1.6.0-r2.ebuild 9690 RMD160 f50872ec88c43d03add7028f067c2a23eba66e27 SHA1 77f6927fc5e4f791d6d545c8ad843978aa2322e7 SHA256 4e2f721da1a196350d410395eacb77c3baefea0a715dda4d6631fccdce2197f6
-EBUILD vdr-1.6.0.ebuild 9624 RMD160 46fc0f889f4369cac352bb3bc30bf3618799e6fd SHA1 7275ec338849605943aa393360e4fd0ce4d18a16 SHA256 71a4e1552c900780cea557a22c2c9c810dc0ee958d5cecb6c7271e678e1f9a49
-EBUILD vdr-1.6.0_p1-r1.ebuild 10060 RMD160 683d2fa9d7fb85855cadff799ab135f1cb83aa00 SHA1 7d36c8a2ac95b75ed1d0cd29b8bac4258ba63357 SHA256 e962511e02114914a2f7f707d26ef1cf8d6565f1f38d17b65232119294fb7bba
-EBUILD vdr-1.6.0_p1.ebuild 9960 RMD160 f1eacaf1ab9b4d12d32dfb75d0c6927e01bffbd7 SHA1 1a80b4d17c44ac06024a8b355a036c78370b9e91 SHA256 e8c0d03b7ab03c7bf97a35b246d8dea508c0918354f8ac0cf28c7ae330a5b0f7
-MISC ChangeLog 20116 RMD160 a4a00f3e8913b96e89b910e05b1b490146f0f1bd SHA1 5cf3a3cef1ab0833e6d15edc5739d32faf5caee6 SHA256 2959c14768fcf1ea2664491bcc77d05c23027125c89a453cf5acc9b7d16872be
+EBUILD vdr-1.4.6.ebuild 5905 RMD160 25c10566e7a49ff87ef9c65a5294197bb7d9439c SHA1 829636d304c3761cce232948f13680659551fcbe SHA256 702d24c25615a8d6da1cdada8435d67c98db5b75e96129d964fc322104896cfb
+EBUILD vdr-1.4.7-r10.ebuild 9380 RMD160 88d4140f2984b08297cc26a2aaae9220af399dce SHA1 547464a951ef7c1d6141606419557bf148124052 SHA256 5e8ed19032aa0b1d2f56355bf1db07c87b152623b35f4923643d289f867242bc
+EBUILD vdr-1.6.0-r1.ebuild 9627 RMD160 10a687fe89372c3146dd4d08188ebe731994f61f SHA1 2a81c3092a64f9ce6a5d18ff0b14213061f5fda9 SHA256 09c6db71c056c9dbce461005646f1874ffaedf12c842a7c5bece36ab55c84e30
+EBUILD vdr-1.6.0-r2.ebuild 9789 RMD160 173130274c5051193dafac74f31a9ffd4608b091 SHA1 64bd4695f47f18f9fb7f7d55a49165ebeb5b9815 SHA256 2991a7a74e09808a6c4942b6ee3e33de50b21d797080eb39e1c8f377cac92db4
+EBUILD vdr-1.6.0.ebuild 9723 RMD160 cee50aa80f6e828b2f30ad04f132e7fa16843ee7 SHA1 5bd44ac51df344d8a5e413ebfe397f3066571b99 SHA256 6f9bdf75b7f3d12b0deec27d9d42234ec7dd6d9dcca4d7e3d5b7ddd4505f1cc2
+EBUILD vdr-1.6.0_p1-r1.ebuild 10159 RMD160 1681a8339863c0674a5d956b5007d9f15b48e6b3 SHA1 e5aeadd96d530e3dc189d69c5644ea3487e26eae SHA256 bef4c837586c82f0df7cfeec44de7b059de46c3495ccd85697aaa6127b6844c8
+EBUILD vdr-1.6.0_p1.ebuild 10059 RMD160 eb16d27043ff95ee6c16ac5e41827e644d7d2ee9 SHA1 749acfd635b6aa02353baa98b32970d5e305b432 SHA256 f611826e4f46c99c3a83c17ac0911d3bb1965d03f7e43858d8e6f06cd5704d0e
+MISC ChangeLog 20462 RMD160 de991fdce8176994a83c551b126f86138e1e79bf SHA1 6166f02514abc00c5eb0d4ca5039cdb08618a99b SHA256 bc28f64393979b2fe9aaf5c1636820e8f880f38c900198285a09221ba18722c6
 MISC metadata.xml 257 RMD160 8bee49b98c59996aaaa019fb2c764c08d8004507 SHA1 d2419394e7d5c7463d7dea33e9190ebd57484531 SHA256 0dd45fbbaf1c6173535e371e3ff8a3faa41f3f89123ac9dffe338998599ebe26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg0J7EACgkQt2vP6XvVdOf1GwCgsUkyz74dLoYWPBBqwCSenAZe
-xE8An0FF3DYD1TT6iU6Rze6X/ND3ZIix
-=V63P
+iEYEARECAAYFAkhU2hoACgkQ/ejvha5XGaN6YwCgkD3RrJIVdXDDCkQMcQFp1EPM
+KhcAoIIe9ZlHZ1pJCO1x0wbf59IKk/RO
+=LcMw
 -----END PGP SIGNATURE-----
diff --git a/media-video/vdr/vdr-1.4.6.ebuild b/media-video/vdr/vdr-1.4.6.ebuild
index 6cb50af6b1b4..616fd75d258d 100644
--- a/media-video/vdr/vdr-1.4.6.ebuild
+++ b/media-video/vdr/vdr-1.4.6.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-video/vdr/vdr-1.4.6.ebuild,v 1.10 2008/05/12 17:15:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.6.ebuild,v 1.11 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -179,9 +179,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now"
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"
diff --git a/media-video/vdr/vdr-1.4.7-r10.ebuild b/media-video/vdr/vdr-1.4.7-r10.ebuild
index 17d1bcb9fd2e..053dc066e752 100644
--- a/media-video/vdr/vdr-1.4.7-r10.ebuild
+++ b/media-video/vdr/vdr-1.4.7-r10.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-video/vdr/vdr-1.4.7-r10.ebuild,v 1.6 2008/05/12 17:15:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.4.7-r10.ebuild,v 1.7 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -329,9 +329,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"
diff --git a/media-video/vdr/vdr-1.6.0-r1.ebuild b/media-video/vdr/vdr-1.6.0-r1.ebuild
index fc030f2e61d4..db3996567247 100644
--- a/media-video/vdr/vdr-1.6.0-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0-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/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.3 2008/05/12 17:15:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r1.ebuild,v 1.4 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -332,9 +332,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"
diff --git a/media-video/vdr/vdr-1.6.0-r2.ebuild b/media-video/vdr/vdr-1.6.0-r2.ebuild
index 6ad1158535d7..47347444e50c 100644
--- a/media-video/vdr/vdr-1.6.0-r2.ebuild
+++ b/media-video/vdr/vdr-1.6.0-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/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.5 2008/05/12 17:15:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0-r2.ebuild,v 1.6 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -332,9 +332,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"
diff --git a/media-video/vdr/vdr-1.6.0.ebuild b/media-video/vdr/vdr-1.6.0.ebuild
index 3cd8132720db..ef153da2d2f9 100644
--- a/media-video/vdr/vdr-1.6.0.ebuild
+++ b/media-video/vdr/vdr-1.6.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/media-video/vdr/vdr-1.6.0.ebuild,v 1.5 2008/05/12 17:15:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0.ebuild,v 1.6 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -337,9 +337,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"
diff --git a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild b/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
index 361d96a6e7c9..873748c24b50 100644
--- a/media-video/vdr/vdr-1.6.0_p1-r1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1-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/media-video/vdr/vdr-1.6.0_p1-r1.ebuild,v 1.1 2008/05/21 13:46:20 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1-r1.ebuild,v 1.2 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -344,9 +344,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"
diff --git a/media-video/vdr/vdr-1.6.0_p1.ebuild b/media-video/vdr/vdr-1.6.0_p1.ebuild
index 778d52097c2a..7f8455f27a15 100644
--- a/media-video/vdr/vdr-1.6.0_p1.ebuild
+++ b/media-video/vdr/vdr-1.6.0_p1.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-video/vdr/vdr-1.6.0_p1.ebuild,v 1.6 2008/05/21 05:50:50 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.6.0_p1.ebuild,v 1.7 2008/06/15 09:00:01 zmedico Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -340,9 +340,14 @@ src_install() {
 	chown -R vdr:vdr "${D}/${CONF_DIR}"
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.3.36-r3"
+	previous_less_than_1_3_36_r3=$?
+}
+
 pkg_postinst() {
 	elog "It is a good idea to run vdrplugin-rebuild now."
-	if has_version "<media-video/vdr-1.3.36-r3"; then
+	if [[ $previous_less_than_1_3_36_r3 = 0 ]] ; then
 		ewarn "Upgrade Info:"
 		ewarn
 		ewarn "If you had used the use-flags lirc, rcu or vfat"