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

4 files changed, 27 insertions, 13 deletions

diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 54d3b837e495..4b1589262fae 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dialup/ppp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.211 2008/05/14 22:05:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.212 2008/06/14 16:54:53 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> ppp-2.4.4-r14.ebuild,
+  ppp-2.4.4-r15.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   14 May 2008; Diego Pettenò <flameeyes@gentoo.org> ppp-2.4.4-r15.ebuild:
   Depend on virtual/pam as the code builds fine with OpenPAM.
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index f5d450f2afbf..de48db7123cb 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -7,14 +7,14 @@ DIST ppp-2.4.4-gentoo-20070903.tar.gz 49574 RMD160 05ac480547465ba4907ea2df95f91
 DIST ppp-2.4.4-gentoo-20080412.tar.gz 47912 RMD160 19cb48bf5f283054bb9fb12b20d6456190d9f5eb SHA1 56ecb29bb910fb726ff3fbdf7425c27d63258e3b SHA256 4a4cd83b378c8d422a9c1ac135e8ffb4db46ab2ab819c9d9f65c4c8ebc2a8bba
 DIST ppp-2.4.4.tar.gz 688763 RMD160 ed289a4506c3af41a72f88103d5e0be44dec3da7 SHA1 9b91b0117e0a8bfaf8c4e894af79e0960dd36259 SHA256 58af45fc07e5f326eea2408df770ea40e4626d1a15e7d564dd054d74880e91ea
 DIST ppp-dhcpc.tgz 33497 RMD160 63bf0d1cc52e91ea536fc593fb7a40502baecd90 SHA1 1a0b02788d522f2137d0b66c749ffe6c96cceb94 SHA256 977fd980bb1d285963d8e27a87b7601ea84317faadfdb40989b258d1853db644
-EBUILD ppp-2.4.4-r14.ebuild 10398 RMD160 f67f188c30910d64721245063ebfa706f7277b77 SHA1 687062e0ba447ce91f33a4fead7a74a12b434ab5 SHA256 b1224de2f60225bbbb58ab769ec1da609f1848ca3722db6f331043097f2273e9
-EBUILD ppp-2.4.4-r15.ebuild 10567 RMD160 f4c1409302bc75fbf86099327273724dc53875cc SHA1 fd13fea4a541dead3bf90ec4e94d494c4bc64222 SHA256 05e50c05f76acdc0243543b2765d7dc36b9367c9e954bfbe585953e8302c9636
-MISC ChangeLog 35104 RMD160 fc4c463073241641aabaf3ef1c10ac4e90d8b497 SHA1 16b00d5a4b7902d8131ec480e12d95abe722a47e SHA256 19c6c99946621fec2d7bfb62b2e538223da4ed5e55d577c21dde336f900e9d9b
+EBUILD ppp-2.4.4-r14.ebuild 10476 RMD160 8b883a43b569d66421f82e6f912ac13498b6cd82 SHA1 4ca1bd229972fe9e726ed1f517e1cb4670696a6a SHA256 ea7f1162287fdd4a45f407d2950dca9c5ba30e134d163b2b6d80e666ee5823ff
+EBUILD ppp-2.4.4-r15.ebuild 10641 RMD160 f43c446a49b40bc6f9f9e0f1398cf4743c1603dc SHA1 a7b52dd69387ae9e832bb84d0d1cae5d3932652c SHA256 b3529c36b4da85993469d935a316bdb75e1acb9b55cb46e1f816fc99da66bb4d
+MISC ChangeLog 35342 RMD160 86d2d6407aef8fe2b49f48c7a76876d4c88f593a SHA1 27370b53070e7bbee6c3ee666b816a9f7fda26f1 SHA256 a804dd1526fc771b66410190555db6012e926895c436899862fe33442d6ef434
 MISC metadata.xml 384 RMD160 98dac63bd0265c815e677f10fd2418231c01b19e SHA1 00f7ddc284f2338465ba8a1d1bc31da70dc6d7bc SHA256 a9f217d596c53c39f17c5e0675b4a9a484a1530b75c460ca7bf4896e6e732683
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgrYhUACgkQAiZjviIA2XjYjQCeOnNsu216OvJ1morIIqhYeYex
-shwAn3ZocZgOwizZW3rg81mbbyp4xn61
-=DH7o
+iEYEARECAAYFAkhT9+MACgkQ/ejvha5XGaOTKACeJoYeeE99cPNrdFEF0o1SgEv1
+IxMAnjgP1/Op0z2XzeoCD3+w+BZhmLC6
+=bTzU
 -----END PGP SIGNATURE-----
diff --git a/net-dialup/ppp/ppp-2.4.4-r14.ebuild b/net-dialup/ppp/ppp-2.4.4-r14.ebuild
index 76cb17f0c13b..04b1685f2b63 100644
--- a/net-dialup/ppp/ppp-2.4.4-r14.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r14.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-dialup/ppp/ppp-2.4.4-r14.ebuild,v 1.3 2008/03/31 04:38:30 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r14.ebuild,v 1.4 2008/06/14 16:54:53 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info pam
 
@@ -132,7 +132,11 @@ src_compile() {
 }
 
 pkg_preinst() {
-	if use radius && [ -d "${ROOT}/etc/radiusclient" ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
+	has_version "<${CATEGORY}/${PN}-2.4.3-r5"
+	previous_less_than_2_4_3_r5=$?
+
+	if use radius && [ -d "${ROOT}/etc/radiusclient" ] && \
+		[[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
 		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
 		cp -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius"
 		eend $?
@@ -281,7 +285,7 @@ pkg_postinst() {
 	# lib name has changed
 	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
 
-	if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
+	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
 		echo
 		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
 		ewarn "   /etc/radiusclient to /etc/ppp/radius."
diff --git a/net-dialup/ppp/ppp-2.4.4-r15.ebuild b/net-dialup/ppp/ppp-2.4.4-r15.ebuild
index 4c8290004f60..d5512621e4d5 100644
--- a/net-dialup/ppp/ppp-2.4.4-r15.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r15.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-dialup/ppp/ppp-2.4.4-r15.ebuild,v 1.2 2008/05/14 22:05:03 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r15.ebuild,v 1.3 2008/06/14 16:54:53 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info pam
 
@@ -133,7 +133,11 @@ src_compile() {
 }
 
 pkg_preinst() {
-	if use radius && [ -d "${ROOT}/etc/radiusclient" ] && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
+	has_version "<${CATEGORY}/${PN}-2.4.3-r5"
+	previous_less_than_2_4_3_r5=$?
+
+	if use radius && [ -d "${ROOT}/etc/radiusclient" ] && \
+		[[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
 		ebegin "Copy /etc/radiusclient to /etc/ppp/radius"
 		cp -pPR "${ROOT}/etc/radiusclient" "${ROOT}/etc/ppp/radius"
 		eend $?
@@ -282,7 +286,7 @@ pkg_postinst() {
 	# lib name has changed
 	sed -i -e "s:^pppoe.so:rp-pppoe.so:" "${ROOT}/etc/ppp/options"
 
-	if use radius && has_version "<${CATEGORY}/${PN}-2.4.3-r5"; then
+	if use radius && [[ $previous_less_than_2_4_3_r5 = 0 ]] ; then
 		echo
 		ewarn "As of ${PN}-2.4.3-r5, the RADIUS configuration files have moved from"
 		ewarn "   /etc/radiusclient to /etc/ppp/radius."