Need to use linux_config_exists before linux_chkconfig_present.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 14 insertions, 8 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 7afe38e2a127..d67882158723 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-firewall/conntrack-tools
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.34 2009/10/10 22:13:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.35 2009/10/24 16:25:25 robbat2 Exp $
+
+  24 Oct 2009; Robin H. Johnson <robbat2@gentoo.org>
+  conntrack-tools-0.9.12.ebuild, conntrack-tools-0.9.13.ebuild:
+  Need to use linux_config_exists before linux_chkconfig_present.
 
   10 Oct 2009; Cédric Krier <cedk@gentoo.org>
   conntrack-tools-0.9.12.ebuild, conntrack-tools-0.9.13.ebuild:
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index a72f72f8114c..975cae7e842f 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -9,9 +9,9 @@ DIST conntrack-tools-0.9.13.tar.bz2 410900 RMD160 d0aeeff33e7effe90dcd3511b6dfcf
 DIST conntrack-tools-0.9.6.tar.bz2 364694 RMD160 9cc9b0354dceffc1496b93b1946c3fe956aded6b SHA1 7580e5a233be54480547bef9ae76f25282ee03ee SHA256 be75ecf9b6ca9f3562552332e623e2bbfb8a2210e81df0f49ad320353c4b7bf7
 DIST conntrack-tools-0.9.9.tar.bz2 403480 RMD160 60b3384624d8142660ba1d9a3c33c7dec9b9f0f7 SHA1 1964dc43d7ceda67d3d6034be083355c02e20cc3 SHA256 54825235b697f224ea57eb86b24742252711d3fbf771076aa360123a906246dc
 EBUILD conntrack-tools-0.9.11.ebuild 1543 RMD160 ab183702c00c12797670ad946ed287a1c34ce099 SHA1 0b9883b36781dc90ea58dd2c88ecd92b3f41b8a4 SHA256 8a65a642c2a7f9acd9553b079226f7fbe05110b42cacaede55f830aa7cc117b0
-EBUILD conntrack-tools-0.9.12.ebuild 1676 RMD160 75eb64c4caf5fbd2b240d4cdde5559ef32242fef SHA1 a4e3827221dd6d1d0da59e3d976ff99d250caa87 SHA256 4d8ccb8f5b5da163a4c5447064a1dfca634c45c25f7f027c855ff2823e436a3f
-EBUILD conntrack-tools-0.9.13.ebuild 1671 RMD160 d387dc32f246bbc6d9a83a0bb8e8f7d2ce20ae72 SHA1 04d51dad9c94f68502e6b2c926ccef384de70537 SHA256 364a17df00a59616e43516cbde75920eb07cb67e10b3f3e5b9135646c2074252
+EBUILD conntrack-tools-0.9.12.ebuild 1706 RMD160 6de975a25d28eeceab059d93d8dd811f0b65e497 SHA1 185c9a4e84e9b647ef9f9916d3cc2015a759a0a1 SHA256 4970a5d2f55e522970b80a980c7eec0b21fbca6aa94242f32c0be203fb3de3a6
+EBUILD conntrack-tools-0.9.13.ebuild 1701 RMD160 810b71270d2573c2dcb9b99de432cae35fe9a56c SHA1 9966c2985f7a1cb2b9c7854beaad45f9f31f2909 SHA256 80510af3dad47550456441df6ba615d72f31f065e8366516ab20e2dec104d2c4
 EBUILD conntrack-tools-0.9.6-r1.ebuild 1612 RMD160 5a8d8f9ec8bb1c3f757e75373b36836e79440bba SHA1 cf9114aa81b771f2586c4da8294b94c712f2eaae SHA256 26da0645063dd5793bb9536d48e4bc4ce8ffbcf780f191988db6e5677ca7d416
 EBUILD conntrack-tools-0.9.9.ebuild 1476 RMD160 f2d3830d9d7633f90c5912f4e30edd2048094649 SHA1 92b732ae4128a097b60c0036ba766c85ee8a462c SHA256 f177f9066d1ca0cd47ef4f102767a7b949da59874eb3535b77f7fd2c51ff05a1
-MISC ChangeLog 5733 RMD160 9173d77079f395debbacc67af8015d5360b14687 SHA1 7fb7a1cb4ce15bf49be1876d3a10fe4e96ddcbe8 SHA256 5a62dd7a2398e50e29972a0ddca4e55f4a1840f37ca697cd4ea498f69a23a1b2
+MISC ChangeLog 5920 RMD160 f084413cb68ce562faabe39c99d64c210655f733 SHA1 584315a150b5a1b4b40af3108d047f1397707980 SHA256 e8bab311b219e033087c9d1930ab3e44b7343827d0ef70eb46c6f26d85379570
 MISC metadata.xml 647 RMD160 a50c408eb92b00628a99f69dd3d7845da9d9b794 SHA1 e6a729b1528e3c2c0653bad8b50e2291ddb2dabf SHA256 b4a43fb3d145d95a50c2612d43e69894277644779e734bf2f0d4c2d6579121f0
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.12.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.12.ebuild
index 8572e76fb7d1..240b2555295c 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.12.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.12.ebuild,v 1.4 2009/10/10 22:13:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.12.ebuild,v 1.5 2009/10/24 16:25:25 robbat2 Exp $
 
 EAPI="2"
 inherit linux-info eutils
@@ -39,7 +39,8 @@ pkg_setup() {
 
 	check_extra_config
 
-	linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
+	linux_config_exists || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
 		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
 		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
 			"are not set when one at least should be."
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.13.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.13.ebuild
index 781f1d13404b..3acf64e374d4 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.13.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.13.ebuild,v 1.3 2009/10/10 22:13:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.13.ebuild,v 1.4 2009/10/24 16:25:25 robbat2 Exp $
 
 EAPI="2"
 inherit linux-info eutils
@@ -39,7 +39,8 @@ pkg_setup() {
 
 	check_extra_config
 
-	linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
+	linux_config_exists || \
+		linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
 		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
 		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
 			"are not set when one at least should be."