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

7 files changed, 69 insertions, 25 deletions

diff --git a/media-gfx/splashutils/ChangeLog b/media-gfx/splashutils/ChangeLog
index df48f4695248..27947b837740 100644
--- a/media-gfx/splashutils/ChangeLog
+++ b/media-gfx/splashutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/splashutils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.137 2008/04/27 19:49:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/ChangeLog,v 1.138 2008/06/14 15:17:16 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> splashutils-1.5.2.1.ebuild,
+  splashutils-1.5.3.4.ebuild, splashutils-1.5.4.ebuild,
+  splashutils-1.5.4-r1.ebuild, splashutils-1.5.4.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.
 
   27 Apr 2008; Markus Meier <maekke@gentoo.org> splashutils-1.5.3.4.ebuild:
   amd64 stable, bug #210588
diff --git a/media-gfx/splashutils/Manifest b/media-gfx/splashutils/Manifest
index 0228c4d97bc7..e3160a352ff1 100644
--- a/media-gfx/splashutils/Manifest
+++ b/media-gfx/splashutils/Manifest
@@ -19,17 +19,17 @@ DIST splashutils-lite-1.5.3.4.tar.bz2 414744 RMD160 a1d655786caa6a7bea84d5a17ea0
 DIST splashutils-lite-1.5.4.1.tar.bz2 419695 RMD160 af9e1fd02b0fdf80c3ae2de0e49176b4e1636581 SHA1 c92578b47d33558a28f8d505d0330885230b62d7 SHA256 42da88318ffcc37fed5e965642171bcd03d57e11bc254a7dfc30638133773737
 DIST splashutils-lite-1.5.4.tar.bz2 420243 RMD160 b0b62fb780a5645717a40547c98f5c42b7df9015 SHA1 a6162bc76d32f90558340598d7f6ade4c3ee00ed SHA256 f4473aff8e6efb1008fc4471da968cb7d707cd6badabe03422d95c631305bba3
 DIST zlib-1.2.3.tar.bz2 425209 RMD160 cfba9984b354dcc38da49331457e6bfc861c6f51 SHA1 967e280f284d02284b0cd8872a8e2e04bfdc7283 SHA256 e3b9950851a19904d642c4dec518623382cf4d2ac24f70a76510c944330d28ca
-EBUILD splashutils-1.5.2.1.ebuild 7420 RMD160 aa0ced0d43d564d522dadf55a823c9bffcfb80b5 SHA1 1eddc1f44ed7b9384d8860cf84fe08c595a08095 SHA256 15c9cc4266f4ccb6beca3f105bf72fb8bb49b4f4ba9220aadd14fecaf7c99c1e
-EBUILD splashutils-1.5.3.4.ebuild 6557 RMD160 9a71737177baa1cac8e78609469be4751c6595cc SHA1 d2b99824cb5195e1488c49fa201f46357496c5b8 SHA256 ed127918a5f344eabb22790ff1083f8697d71077fbab097446333ffad63ce2e1
-EBUILD splashutils-1.5.4-r1.ebuild 6825 RMD160 76ad53e8b25044bae211a8022514c63ab419fe99 SHA1 fa286c715229ed6a9a5fba4fbadf4b7649311c22 SHA256 9e2aa5b66381f77b97cd1b4031e8b2facd8efa3d4058768de35b8411162b2680
-EBUILD splashutils-1.5.4.1.ebuild 6575 RMD160 d7721d34bede7fb4a2d815819b096c759e38d557 SHA1 c7d352046bddbef5a63ae9527ac7e81bcd9f3386 SHA256 465753fe460a8c2ecbbd72f945a1ae4c377058c5395f9e1412a9ac6e764056b5
-EBUILD splashutils-1.5.4.ebuild 6557 RMD160 28d6c778553f0d3d6908707e8b5f1a3eb48391a3 SHA1 24df3a832244e5f83624752a81b9ae930cc8fcda SHA256 2baf5c45e31c72cd77936decba70d46c15ef35aaa793cbf45ab30f1196563a96
-MISC ChangeLog 25843 RMD160 0c73c2fbcb5a5d3ec10a0aa77ba2594fec5e313e SHA1 5269b86179e65c44b61a4e61ab4e3643ec448f3e SHA256 b5ca0413c9ec2cf5de7669dab80a1572c7064c72f4d594859e63895311ebf537
+EBUILD splashutils-1.5.2.1.ebuild 7498 RMD160 cd893c2b4246093e902b9931b9ff1042cd88b84c SHA1 6a9effa03be2c35f51f9201874ed1553ac99a529 SHA256 3adff265bde2d45586f75b4d124016e065388b2bfdeae422438d84d15f476ee2
+EBUILD splashutils-1.5.3.4.ebuild 6698 RMD160 6d464e409c4ad39ce7d157f02d764a8142d70737 SHA1 e8f446958ff2ae66fb282d942715f2d0b16795e3 SHA256 485651af4a4e8c36316bd3e8b25d5f75f3a1383cbe692c89d2f0db53c715adec
+EBUILD splashutils-1.5.4-r1.ebuild 6967 RMD160 fca1841102e85d461a7ec5f3cf7f8a075527c564 SHA1 360610cb8f3aa72cf6e16340e6bed37ae7998c0b SHA256 4bfec03ff8b8366e56db2604da76090d41d2994dea80199556f42bad6932c3dc
+EBUILD splashutils-1.5.4.1.ebuild 6717 RMD160 5da4f6ccae074d00b8b8f569d7692c4d466df600 SHA1 0b980be61a293e0451c911a3517ff7fde8d73f09 SHA256 1899f3f5e278de175ec579a2da754ba54af5cbbf771d406e3f72ed508d4e7654
+EBUILD splashutils-1.5.4.ebuild 6699 RMD160 0b53451998aab27802cee09b530c00ec8c5305e4 SHA1 162c52663a33b93390454b8b1849b18b27341406 SHA256 281183c263272e6e51033ced8114f8f130320ffd86b2d7faafbedbdc6cb0e5f6
+MISC ChangeLog 26181 RMD160 8034b3569d9e75f1ae183d7412e3fa38c9c73b80 SHA1 27e6da21de88916a2a20aa0a177a8cc2ef031046 SHA256 e3ac6dfef1e48111098f414406e7c9591bbe3e17c36a9d5b81d97dd34946064c
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgU2OwACgkQkKaRLQcq0GJETACaA7O0Q2jXRUHURgYfTn3PpjxA
-PmIAn3f+EhnIzbbmuiMTX+jSOOuIglCf
-=baFj
+iEYEARECAAYFAkhT4QIACgkQ/ejvha5XGaNelACg7dKoyHU4B5wVsgnaR9ZCJEjY
+ukYAn22LbGyQtlKqyEZcpoTyWRbGsM3R
+=oNgz
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/splashutils/splashutils-1.5.2.1.ebuild b/media-gfx/splashutils/splashutils-1.5.2.1.ebuild
index e4ececcdc5ff..a0a4eb3603b7 100644
--- a/media-gfx/splashutils/splashutils-1.5.2.1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.2.1.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/media-gfx/splashutils/splashutils-1.5.2.1.ebuild,v 1.6 2007/12/21 15:09:30 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.2.1.ebuild,v 1.7 2008/06/14 15:17:16 zmedico Exp $
 
 inherit eutils multilib toolchain-funcs
 
@@ -174,6 +174,11 @@ src_install() {
 	dosym /${LIB}/splash/bin/fbres /sbin/fbres
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+}
+
 pkg_postinst() {
 	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
@@ -184,7 +189,7 @@ pkg_postinst() {
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.0' ; then
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
 		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
 		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
 		elog ""
diff --git a/media-gfx/splashutils/splashutils-1.5.3.4.ebuild b/media-gfx/splashutils/splashutils-1.5.3.4.ebuild
index 3fadec368d99..18a7d2642b52 100644
--- a/media-gfx/splashutils/splashutils-1.5.3.4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.3.4.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-gfx/splashutils/splashutils-1.5.3.4.ebuild,v 1.5 2008/04/27 19:49:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.3.4.ebuild,v 1.6 2008/06/14 15:17:16 zmedico Exp $
 
 EAPI="1"
 
@@ -147,6 +147,14 @@ src_install() {
 	dosym /${LIB}/splash/bin/fbres /sbin/fbres
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
 pkg_postinst() {
 	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
@@ -157,13 +165,13 @@ pkg_postinst() {
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.0' ; then
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
 		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
 		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.5.3' && ! use fbcondecor ; then
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
 		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
 		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
 		elog "to use fbcondecor, run:"
diff --git a/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild b/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild
index 83e1e7736c26..b15fd1420526 100644
--- a/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4-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-gfx/splashutils/splashutils-1.5.4-r1.ebuild,v 1.4 2008/04/17 13:11:34 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4-r1.ebuild,v 1.5 2008/06/14 15:17:16 zmedico Exp $
 
 EAPI="1"
 
@@ -158,6 +158,14 @@ src_install() {
 	dosym /${LIB}/splash/bin/fbres /sbin/fbres
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
 pkg_postinst() {
 	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
@@ -168,13 +176,13 @@ pkg_postinst() {
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.0' ; then
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
 		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
 		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.5.3' && ! use fbcondecor ; then
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
 		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
 		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
 		elog "to use fbcondecor, run:"
diff --git a/media-gfx/splashutils/splashutils-1.5.4.1.ebuild b/media-gfx/splashutils/splashutils-1.5.4.1.ebuild
index ac4333332af4..5724ab91aec8 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.1.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.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/media-gfx/splashutils/splashutils-1.5.4.1.ebuild,v 1.1 2008/04/20 09:04:41 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.1.ebuild,v 1.2 2008/06/14 15:17:16 zmedico Exp $
 
 EAPI="1"
 
@@ -148,6 +148,14 @@ src_install() {
 	dosym /${LIB}/splash/bin/fbres /sbin/fbres
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
 pkg_postinst() {
 	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
@@ -158,13 +166,13 @@ pkg_postinst() {
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.0' ; then
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
 		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
 		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.5.3' && ! use fbcondecor ; then
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
 		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
 		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
 		elog "to use fbcondecor, run:"
diff --git a/media-gfx/splashutils/splashutils-1.5.4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.ebuild
index 991497bb6f63..299bf94009bc 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.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-gfx/splashutils/splashutils-1.5.4.ebuild,v 1.1 2008/02/25 23:03:56 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.ebuild,v 1.2 2008/06/14 15:17:16 zmedico Exp $
 
 EAPI="1"
 
@@ -147,6 +147,14 @@ src_install() {
 	dosym /${LIB}/splash/bin/fbres /sbin/fbres
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-1.0"
+	previous_less_than_1_0=$?
+
+	has_version "<${CATEGORY}/${PN}-1.5.3"
+	previous_less_than_1_5_3=$?
+}
+
 pkg_postinst() {
 	if has_version sys-fs/devfsd || ! has_version sys-fs/udev ; then
 		elog "This package has been designed with udev in mind. Other solutions, such as"
@@ -157,13 +165,13 @@ pkg_postinst() {
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.0' ; then
+	if [[ $previous_less_than_1_0 = 0 ]] ; then
 		elog "Since you are upgrading from a pre-1.0 version, please make sure that you"
 		elog "rebuild your initrds. You can use the splash_geninitramfs script to do that."
 		elog ""
 	fi
 
-	if has_version '<media-gfx/splashutils-1.5.3' && ! use fbcondecor ; then
+	if [[ $previous_less_than_1_5_3 = 0 ]] && ! use fbcondecor ; then
 		elog "Starting with splashutils-1.5.3, support for the fbcondecor kernel patch"
 		elog "is optional and dependent on the the 'fbcondecor' USE flag.  If you wish"
 		elog "to use fbcondecor, run:"