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

11 files changed, 92 insertions, 39 deletions

diff --git a/net-firewall/iptables/ChangeLog b/net-firewall/iptables/ChangeLog
index 397aa7a2b46c..8bd03e40266f 100644
--- a/net-firewall/iptables/ChangeLog
+++ b/net-firewall/iptables/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-firewall/iptables
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.167 2008/06/09 09:31:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/ChangeLog,v 1.168 2008/06/14 14:04:51 zmedico Exp $
+
+  14 Jun 2008; Zac Medico <zmedico@gentoo.org> iptables-1.3.5-r4.ebuild,
+  iptables-1.3.6.ebuild, iptables-1.3.6-r1.ebuild, iptables-1.3.7.ebuild,
+  iptables-1.3.8.ebuild, iptables-1.3.8-r1.ebuild, iptables-1.3.8-r2.ebuild,
+  iptables-1.3.8-r3.ebuild, iptables-1.4.0.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   09 Jun 2008; Mike Frysinger <vapier@gentoo.org>
   +files/iptables-1.4.0-in6-glibc-2.8.patch, iptables-1.4.0-r1.ebuild:
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 57844478bd70..cbcc0d4122e0 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -30,22 +30,22 @@ DIST netfilter-layer7-v2.17.tar.gz 160408 RMD160 9823d7b411e18160dc8501a6a5d2129
 DIST netfilter-layer7-v2.3.tar.gz 105587 RMD160 4c5c5315cf1f193c9ceb605d8d9d9328b515c64d SHA1 cfbe80a6c5725732e4935692e4b0cf5b42abd4f0 SHA256 4a5e4475d05c8d0998e56d12e8e27eb9acf23ce80a53000783b2f609a6bb33aa
 DIST netfilter-layer7-v2.6.tar.gz 122514 RMD160 31b68ae3baa0a340f2e4a555fd5124c3b977629d SHA1 6120eae8bd405d35d079774d191830d137643147 SHA256 c5a842c037e915eb72576e5861f0b048837719f1edf448775d9218b42c48e0aa
 DIST netfilter-layer7-v2.9.tar.gz 122497 RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d SHA1 c4a1d92855ad51413fbd7229fe9decfe45aac084 SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969
-EBUILD iptables-1.3.5-r4.ebuild 5844 RMD160 fb2ae4b8fba1cace3222debb28c43bebb7032eb4 SHA1 4dd96fdf3a2904689d6cbfa8be8deb934c365930 SHA256 01f706fe79e5190658a6299e986d51e9aa8e06e0b7443eab22a1d65740b03234
-EBUILD iptables-1.3.6-r1.ebuild 5719 RMD160 6294936d113e04a1369337ff8273428c8f213c1f SHA1 f7cd39b21eb8ceb634c73d0587aa8289726a69a0 SHA256 35d98d0188b609b6741a2b72d2548d10dfc4338bbd747b1d5522c4cd7e5ddd22
-EBUILD iptables-1.3.6.ebuild 5717 RMD160 c20d9fb77ef9c37ccd6a456b068ef518a99ea11e SHA1 9e1eb30059c04ca58430eec4f791c51e2abdcc90 SHA256 f46928f266ab96a5e20389264019e2851e151dcfc65a556bc708af5788da81a0
-EBUILD iptables-1.3.7.ebuild 5865 RMD160 14a9d6657b06bce561fa6c0e24a2251eb9521610 SHA1 5920e46109db3c5c80288e4241f73dab697cd211 SHA256 4371735b529bbb7dff0a9bbcb1ab921f951e807ed346504c8e8ca2e133759280
-EBUILD iptables-1.3.8-r1.ebuild 6219 RMD160 715c30797cb164645b0deb7d2ae7e7bc046370c5 SHA1 21dbe79a9a7601ffed40322528957f0c3adc2834 SHA256 0bbe6e5d7943b3abd8375c516308364fc1e048e91d61d3f495fb91a36c70ff52
-EBUILD iptables-1.3.8-r2.ebuild 7047 RMD160 4ab8cb0ad342ee29b10c4e36dee8f29b5bc0b1fb SHA1 7f13a955ba23ae4177979c608145ddd8ddf78d22 SHA256 d0da420ae4be177d29eb0192702c9e797940749f9551671f39149a000e8d97e3
-EBUILD iptables-1.3.8-r3.ebuild 7057 RMD160 fe4d2cdabb0b3d4d963bd80cb5445427a9dc7d93 SHA1 dbdae40cf23cb2cd62fcfda67576025f338b90cb SHA256 75f3209cc715949fba4bcab1af4e107deaa8d769d089be4f383f8f074fa83690
-EBUILD iptables-1.3.8.ebuild 5655 RMD160 54dfc7ce735c4a1c81af1ef1ad71859bc0e478e0 SHA1 d8b0f148549e5ffa6d86674291e0bb8f21f3d0db SHA256 1674842ce149e1e22c0f91e6348ca8f1369347acf7170b70c83bed5f11bd9289
+EBUILD iptables-1.3.5-r4.ebuild 5914 RMD160 52cbd6a104a6112c7a51334f383548c7a180b99c SHA1 6ce861bbc3a1b7ced8618fd60be4c59238537e55 SHA256 fb6457335c56d2be78ac1bdf1c799bbe6fe1b4f470670c5453e3bcc5b087ea06
+EBUILD iptables-1.3.6-r1.ebuild 5789 RMD160 f29ea64894fdea9d558fe780109a5bb89b26ed6a SHA1 4e6b5df961575561260b74b6e87ed2e79d189085 SHA256 46e64a82f6a1d41baf86571134be3b8f01c77cafd52fa1c97d830117e7a62e28
+EBUILD iptables-1.3.6.ebuild 5787 RMD160 1c64853e182b8ce800126d23c0cfad85f2688715 SHA1 212dd0a2c39d3d7c2dc1e8e156e1df95164db121 SHA256 175b04e547e2abc407d78827e66c874225b90d2c49d37fb43cf9433e5f682f1b
+EBUILD iptables-1.3.7.ebuild 5931 RMD160 8e8a4810edb09c47836473b2b60cf6a01deba92b SHA1 455adacfac9e03f16125ba7bfced0faa74e39069 SHA256 f062c011807873a1a7bee175b30e605125a741d3c7c093e75ffb2369815acb1a
+EBUILD iptables-1.3.8-r1.ebuild 6289 RMD160 92795ad9ef062ccae3e5ceb07785fc9ca3cd9ba4 SHA1 35540ddbdf14c5538e737424d1f1c36110bdbdc6 SHA256 a68e23811f563dd336ad6cf7700a6a63509b7dff61bd94580bef56459958cea1
+EBUILD iptables-1.3.8-r2.ebuild 7120 RMD160 dfa304a41ce108a880d112644ac1f7e8fe22e186 SHA1 f2602e509f3eeff29d53a11ca4538eac2d20eea0 SHA256 2e608672368b336c0f75bdf477d4d20cf5cd6338f4326f5c3a55054fd0d1da02
+EBUILD iptables-1.3.8-r3.ebuild 7128 RMD160 64d5bb2f5e8eb5421c930b6d8df0e19dfb83a67a SHA1 c1166af8498cba39492296559245a7bf57bc80d3 SHA256 8085bd074ab9b190e0274d73df311335300644b6a731718667efdba0454a66bc
+EBUILD iptables-1.3.8.ebuild 5725 RMD160 4584b79966009a9ddf034a5b3f0dbeff90586091 SHA1 86713d6b1b1bf9cf4af5df87b1ca404eef6f46ea SHA256 7bcd00072be49f1c6f34d4ec80564f1f7357ab1eb7e1725d3833a109aa6a3343
 EBUILD iptables-1.4.0-r1.ebuild 6246 RMD160 6f4a33f4599496158dc973ff5950e63fbdc26b16 SHA1 9b0b04ad379a2ce8dd51237a5e54caf9dbe81515 SHA256 6995a46e06f66e0dc61704a249bb73d2dd948be619d37c15bb369d0d5073137d
-EBUILD iptables-1.4.0.ebuild 5972 RMD160 8395840f3652843133b6267ff204e40e3ecd3ef2 SHA1 bcc1adc3e2ffb1b452ef35e6e7b7f477bf313398 SHA256 409f00e4342fde45648716a7613425cc8c8a8c0f676af8c18c50c5c704a29c5a
-MISC ChangeLog 31999 RMD160 26bf465fd5edebaf1b8f90dff5d29b3abfd374c5 SHA1 af04675d2a42bb564673983272c2b8649c8d8439 SHA256 20fed0ee59ba3dd4cae628ed70524c075418395006a5aca3265a9b3300a5977d
+EBUILD iptables-1.4.0.ebuild 6045 RMD160 db798d096d84c86c29e8bf5324a5a3eafffaf66a SHA1 29c876d6721ac91853b1086934c7699a9b5a4e3d SHA256 7c1b1aee43540940ee8499b5f6ffae79eeb6704fe6d6aaac40a5d7439e73477d
+MISC ChangeLog 32422 RMD160 b3e5cc6b916ba813bfb495440c9bacb75e73b4e5 SHA1 727630fa18d636e8803374c10ca9f8bc5487ffa1 SHA256 4214a68d808f02fa9ccf4f9cc52dd6e81046c4e00d0385faa9e144c6fe85edb9
 MISC metadata.xml 1015 RMD160 0bb4f52ba327423420cdcc23db5cee7063c44d57 SHA1 5b4bae641caf5a6e8b55e1f152097b439ec64fed SHA256 5f5208578deb289580374039a678ee613fe0ed13fe131e24b82a4c5b3ee72a9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFITPiEj9hvisErhMIRAp3yAKDTIHXfWnnBm61ObP8zEkIWd37H4QCgkU2B
-eOrXgKQn08RvWJfNGvrsdVc=
-=HjJp
+iEYEARECAAYFAkhT0AsACgkQ/ejvha5XGaNq7wCgoQNrFBnLzGMc7Nh8tkOPgNsm
+va4Anj2tEH2b20LDNahbvsyIepgAj4gp
+=eoza
 -----END PGP SIGNATURE-----
diff --git a/net-firewall/iptables/iptables-1.3.5-r4.ebuild b/net-firewall/iptables/iptables-1.3.5-r4.ebuild
index 07ccc11f83c4..97cb1489de47 100644
--- a/net-firewall/iptables/iptables-1.3.5-r4.ebuild
+++ b/net-firewall/iptables/iptables-1.3.5-r4.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/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.16 2007/05/06 09:54:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.5-r4.ebuild,v 1.17 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -154,6 +154,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -175,7 +180,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.6-r1.ebuild b/net-firewall/iptables/iptables-1.3.6-r1.ebuild
index 2d39e9d1e8b8..efabf580971b 100644
--- a/net-firewall/iptables/iptables-1.3.6-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.3.6-r1.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/net-firewall/iptables/iptables-1.3.6-r1.ebuild,v 1.2 2007/05/06 09:54:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.6-r1.ebuild,v 1.3 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -152,6 +152,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -173,7 +178,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		echo
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.6.ebuild b/net-firewall/iptables/iptables-1.3.6.ebuild
index 71c85dec8730..8e96dee3eedb 100644
--- a/net-firewall/iptables/iptables-1.3.6.ebuild
+++ b/net-firewall/iptables/iptables-1.3.6.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/net-firewall/iptables/iptables-1.3.6.ebuild,v 1.2 2007/05/06 09:54:40 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.6.ebuild,v 1.3 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -152,6 +152,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -173,7 +178,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.7.ebuild b/net-firewall/iptables/iptables-1.3.7.ebuild
index 4ab8eb758772..4cee90ddad94 100644
--- a/net-firewall/iptables/iptables-1.3.7.ebuild
+++ b/net-firewall/iptables/iptables-1.3.7.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/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.11 2007/08/13 21:31:41 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.7.ebuild,v 1.12 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -155,6 +155,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -176,7 +181,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.8-r1.ebuild b/net-firewall/iptables/iptables-1.3.8-r1.ebuild
index b884d2d0bb76..dc32140296b7 100644
--- a/net-firewall/iptables/iptables-1.3.8-r1.ebuild
+++ b/net-firewall/iptables/iptables-1.3.8-r1.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/net-firewall/iptables/iptables-1.3.8-r1.ebuild,v 1.10 2007/12/10 21:33:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r1.ebuild,v 1.11 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -172,6 +172,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -193,7 +198,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.8-r2.ebuild b/net-firewall/iptables/iptables-1.3.8-r2.ebuild
index ab13fc767a1f..0613a669018f 100644
--- a/net-firewall/iptables/iptables-1.3.8-r2.ebuild
+++ b/net-firewall/iptables/iptables-1.3.8-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/net-firewall/iptables/iptables-1.3.8-r2.ebuild,v 1.11 2008/01/11 17:47:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r2.ebuild,v 1.12 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -192,6 +192,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -213,7 +218,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.8-r3.ebuild b/net-firewall/iptables/iptables-1.3.8-r3.ebuild
index 681e41838b30..d04e1eecc7f0 100644
--- a/net-firewall/iptables/iptables-1.3.8-r3.ebuild
+++ b/net-firewall/iptables/iptables-1.3.8-r3.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-firewall/iptables/iptables-1.3.8-r3.ebuild,v 1.9 2008/03/16 08:48:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8-r3.ebuild,v 1.10 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -192,6 +192,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -213,7 +218,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.3.8.ebuild b/net-firewall/iptables/iptables-1.3.8.ebuild
index 3a35c8ccc259..b70479355351 100644
--- a/net-firewall/iptables/iptables-1.3.8.ebuild
+++ b/net-firewall/iptables/iptables-1.3.8.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/net-firewall/iptables/iptables-1.3.8.ebuild,v 1.2 2007/06/25 17:01:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.3.8.ebuild,v 1.3 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils flag-o-matic toolchain-funcs linux-info
 
@@ -150,6 +150,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -171,7 +176,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"
diff --git a/net-firewall/iptables/iptables-1.4.0.ebuild b/net-firewall/iptables/iptables-1.4.0.ebuild
index fb18e66873b3..e18a089b2422 100644
--- a/net-firewall/iptables/iptables-1.4.0.ebuild
+++ b/net-firewall/iptables/iptables-1.4.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/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.4 2008/01/08 16:23:30 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/iptables/iptables-1.4.0.ebuild,v 1.5 2008/06/14 14:04:51 zmedico Exp $
 
 inherit eutils toolchain-funcs linux-info
 
@@ -159,6 +159,11 @@ src_install() {
 	fi
 }
 
+pkg_preinst() {
+	has_version "=${CATEGORY}/${PN}-1.2*"
+	upgrade_from_1_2_x=$?
+}
+
 pkg_postinst() {
 	elog "This package now includes an initscript which loads and saves"
 	elog "rules stored in /var/lib/iptables/rules-save"
@@ -180,7 +185,7 @@ pkg_postinst() {
 		ewarn "  net.ipv6.ip_forward = 1"
 		ewarn "for ipv6."
 	fi
-	if has_version '=net-firewall/iptables-1.2*' ; then
+	if [[ $upgrade_from_1_2_x = 0 ]] ; then
 		ewarn
 		ewarn "When upgrading from iptables-1.2.x, you may be unable to remove"
 		ewarn "rules added with iptables-1.2.x.  This is a known issue, please see:"