Bug #226505 - For compatibity 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

5 files changed, 35 insertions, 14 deletions

diff --git a/dev-util/scons/ChangeLog b/dev-util/scons/ChangeLog
index 9de03dc9bd14..2c3edc7b4ba2 100644
--- a/dev-util/scons/ChangeLog
+++ b/dev-util/scons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-util/scons
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.56 2008/05/29 13:41:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/ChangeLog,v 1.57 2008/06/14 11:45:06 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> scons-0.97.ebuild,
+  scons-0.98.3.ebuild, scons-0.98.4.ebuild:
+  Bug #226505 - For compatibity with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
 *scons-0.98.4 (29 May 2008)
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 684c77e7eb71..986bcb959b5f 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -4,15 +4,15 @@ Hash: SHA1
 DIST scons-0.97.tar.gz 439523 RMD160 31af35ef62fe56a4faf291a4d6cb73de5a17d81f SHA1 732980f0f4dba7cba32fffca0b533497ef751afc SHA256 195df54afedd60767e55393187df0f1e7e0ddb3a46347a5ee82d5050f964c3ba
 DIST scons-0.98.3.tar.gz 537687 RMD160 c1be0d3fc070e0957d52c4632539a17f3d349ad8 SHA1 0378dee14ace1601fce881a35d109115d3c6a014 SHA256 e9170fae07cf5eb0d9e6b519198d87811dc9905166591e913dcab3a01fee1b09
 DIST scons-0.98.4.tar.gz 538335 RMD160 5e62877feaec7b543a3062c8c47eaa04c63a866b SHA1 b61764fe6fc7562f5034b71885323604cd6c74f5 SHA256 872b6e1da0003cf3b709e31af7b55721a1730690e1dd6a4a71612c7eb22602df
-EBUILD scons-0.97.ebuild 1150 RMD160 3b6b2e76405f732b69a20d73e0551045ad25b466 SHA1 22307eab358f268d6493a266a02ec161e09d63a2 SHA256 2ee23e94e7665ef1c0a1392faf29145548c9f83d612f5c9296c269880907c83e
-EBUILD scons-0.98.3.ebuild 1160 RMD160 e13ee4d4f7248916e72c19c5bb9ab90efe402277 SHA1 a19bf4016842d8f0df58c4f3b0a3d715bde22085 SHA256 ace98cf07a3b8eb08813b2a891c97b1805940214f51e99d49b804e770f98576d
-EBUILD scons-0.98.4.ebuild 1160 RMD160 8c32337e5934937c7148e178d41ed451a27e232d SHA1 01a53b88be0de62636984d8e74d4486d90b8de18 SHA256 1c49f03e5fd5247a4e125d2ed777278489b3c4a7f69e8992496c636967446c29
-MISC ChangeLog 376 RMD160 e648fbb3ae9655f94b39f4a92feb968b5011d363 SHA1 1bcb51bce43f5dfa0228e24ff73779628566cfd9 SHA256 5997465be9b920fd657274a961f0ba34b7f0622df0a1baf31cc3591d9194b8f0
+EBUILD scons-0.97.ebuild 1223 RMD160 2073ac6cda489a1e16a8117f614ef20f64947fc8 SHA1 8bd2dff85730982bd27a42ee33f9ecb5e3712db0 SHA256 04721c8854ae629c5eda9510a946afafb5c4692457193840395419df584b7639
+EBUILD scons-0.98.3.ebuild 1232 RMD160 ddf568d6fa4931ee97d6ee46056b1a3966a138b3 SHA1 bbe5fc2f897c614c969e425f5aa983724d118a70 SHA256 80a1c2d82906381c4817cc02823825f60a322b074c9e35362929599fb7bb29c6
+EBUILD scons-0.98.4.ebuild 1232 RMD160 93fb04e08d3cfd545d2db3f5d1024fe0932caccd SHA1 7e2fb6a5391d2e9f7850be00a4e45cb6acadc7bd SHA256 2bc5b3a0f8bec0e44b94ff52af6ba66f6ca3826af62507b72a3bd7d7b623c92a
+MISC ChangeLog 631 RMD160 6fa8e5fc85c887ed72237de02fa11a777c54648d SHA1 b839ab8413472a9d14e3b3694d3c9fa2d221ecfc SHA256 6dbd031b8ed2e594d15ed1210fb329a5e747e5ed0a91bb6c47a89c064a4608fc
 MISC metadata.xml 259 RMD160 e07f81006af8091709da130bf7766960545d08b1 SHA1 d68efa412545d069a60b0e13c20b910a5680eeaa SHA256 d20eefe0b0976cc928c0e17b9e5ba6c670f30ebb49086955e6f6b335fbb597ef
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkg+soQACgkQQU4yORhF8iAZVACfZrTJwv8mEpt5RpqUWcHP4e+X
-oLgAoI5HA69H5XzeOOOnwxzFcsJdRsdV
-=av+Z
+iEYEARECAAYFAkhTr0YACgkQ/ejvha5XGaP6/ACgjfcF6lP+kTehGrfeHd0q97NN
+xMgAn3jaz/XyM3vmeOJn3aUvyHFZm0ss
+=DWqc
 -----END PGP SIGNATURE-----
diff --git a/dev-util/scons/scons-0.97.ebuild b/dev-util/scons/scons-0.97.ebuild
index 865fa7c1bbbb..3ef736df4115 100644
--- a/dev-util/scons/scons-0.97.ebuild
+++ b/dev-util/scons/scons-0.97.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/dev-util/scons/scons-0.97.ebuild,v 1.9 2008/05/13 18:36:19 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.97.ebuild,v 1.10 2008/06/14 11:45:06 zmedico Exp $
 
 NEED_PYTHON="1.5.2"
 
@@ -24,11 +24,16 @@ src_install () {
 	mv "${D}"/usr/man "${D}"/usr/share
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.96.92-r1"
+	clean_stale_junk=$?
+}
+
 pkg_postinst() {
 	python_mod_optimize /usr/$(get_libdir)/${P}
 	# clean up stale junk left there by old faulty ebuilds
 	# see Bug 118022 and Bug 132448
-	if has_version "<dev-util/scons-0.96.92-r1" ; then
+	if [[ $clean_stale_junk = 0 ]] ; then
 		einfo "Cleaning up stale orphaned py[co] files..."
 		[[ -d "${ROOT}/usr/$(get_libdir)/scons/SCons" ]] \
 		    && rm -rf "${ROOT}/usr/$(get_libdir)/scons/SCons"
diff --git a/dev-util/scons/scons-0.98.3.ebuild b/dev-util/scons/scons-0.98.3.ebuild
index 9463036d899b..95826a8dc747 100644
--- a/dev-util/scons/scons-0.98.3.ebuild
+++ b/dev-util/scons/scons-0.98.3.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/dev-util/scons/scons-0.98.3.ebuild,v 1.1 2008/05/13 18:36:19 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.98.3.ebuild,v 1.2 2008/06/14 11:45:06 zmedico Exp $
 
 NEED_PYTHON="1.5.2"
 
@@ -24,11 +24,16 @@ src_install () {
 	mv "${D}"/usr/man "${D}"/usr/share
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.96.92-r1"
+	clean_stale_junk=$?
+}
+
 pkg_postinst() {
 	python_mod_optimize /usr/$(get_libdir)/${P}
 	# clean up stale junk left there by old faulty ebuilds
 	# see Bug 118022 and Bug 132448
-	if has_version "<dev-util/scons-0.96.92-r1" ; then
+	if [[ $clean_stale_junk = 0 ]] ; then
 		einfo "Cleaning up stale orphaned py[co] files..."
 		[[ -d "${ROOT}/usr/$(get_libdir)/scons/SCons" ]] \
 		    && rm -rf "${ROOT}/usr/$(get_libdir)/scons/SCons"
diff --git a/dev-util/scons/scons-0.98.4.ebuild b/dev-util/scons/scons-0.98.4.ebuild
index 42f4bd505a47..2548d77dd372 100644
--- a/dev-util/scons/scons-0.98.4.ebuild
+++ b/dev-util/scons/scons-0.98.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/dev-util/scons/scons-0.98.4.ebuild,v 1.1 2008/05/29 13:41:17 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/scons/scons-0.98.4.ebuild,v 1.2 2008/06/14 11:45:06 zmedico Exp $
 
 NEED_PYTHON="1.5.2"
 
@@ -24,11 +24,16 @@ src_install () {
 	mv "${D}"/usr/man "${D}"/usr/share
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.96.92-r1"
+	clean_stale_junk=$?
+}
+
 pkg_postinst() {
 	python_mod_optimize /usr/$(get_libdir)/${P}
 	# clean up stale junk left there by old faulty ebuilds
 	# see Bug 118022 and Bug 132448
-	if has_version "<dev-util/scons-0.96.92-r1" ; then
+	if [[ $clean_stale_junk = 0 ]] ; then
 		einfo "Cleaning up stale orphaned py[co] files..."
 		[[ -d "${ROOT}/usr/$(get_libdir)/scons/SCons" ]] \
 		    && rm -rf "${ROOT}/usr/$(get_libdir)/scons/SCons"