Warn instead of die on CONFIG_CHECK for bug #283585

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 12 insertions, 18 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index a7659bf0b69f..7afe38e2a127 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.33 2009/09/03 11:48:22 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.34 2009/10/10 22:13:34 cedk Exp $
+
+  10 Oct 2009; Cédric Krier <cedk@gentoo.org>
+  conntrack-tools-0.9.12.ebuild, conntrack-tools-0.9.13.ebuild:
+  Warn instead of die on CONFIG_CHECK for bug #283585
 
   03 Sep 2009; Mike Auty <ikelos@gentoo.org>
   conntrack-tools-0.9.6-r1.ebuild, conntrack-tools-0.9.9.ebuild,
diff --git a/net-firewall/conntrack-tools/Manifest b/net-firewall/conntrack-tools/Manifest
index 06e343f21018..a72f72f8114c 100644
--- a/net-firewall/conntrack-tools/Manifest
+++ b/net-firewall/conntrack-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX conntrack-tools-0.9.11-INT_MAX.patch 1224 RMD160 58744f0c562b95b16b4acf30a8ef3e359ed235dc SHA1 9b520a61f6e61ce61dba9cbc7c9647376b50b977 SHA256 9a41c1b0daa43ec81258b95a93af2893abc0efaa3beebda3762686eb4635e243
 AUX conntrackd.confd 52 RMD160 47916dc2eb970b2eec7c5c1bc9d2e733c8308b30 SHA1 2c816f7e8a5eae3dab9a08d97587803206054916 SHA256 81890c5d01142dad0f16ffd3d29019058063d77bb0233a7ed412f84519078421
 AUX conntrackd.confd-r1 498 RMD160 bf3f8cb47793be3021beaa470c1af86777c321ee SHA1 72a737edb54f073aab93eaf4fce87fd944f47981 SHA256 6171121881f824bccc2709d6e74e2d5955391fbb9c591afcca741a3239fd3ed7
@@ -12,16 +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 30c1167f848289b5b133b56420e67c1991516650 SHA1 444d9f344fa861d72f91c8bf26dcbea46a1fccac SHA256 2e7712c3f9760a366b73352fdb5f16f9600ebeb7f35a2456765f7d7f44ca06d9
-EBUILD conntrack-tools-0.9.13.ebuild 1671 RMD160 3a2d1294e428bfc166f37483d79a86d3faadcfef SHA1 3501a586d70ec50afc665d6e630e0c7b08ba2ab1 SHA256 9ae09eff817c2db24fbe68650e76e9c3c761924b86ed562d46e0fc7f3b07a9ff
+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.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 5569 RMD160 d504927474137a87294e603f2f5d47e15a41867a SHA1 a9802033f62c62d66db093106c679fe2c253e4fe SHA256 afad864fe962f3317c4a147eb5c84ea7c941486ca9a2ef840d088a5c7c5925f6
+MISC ChangeLog 5733 RMD160 9173d77079f395debbacc67af8015d5360b14687 SHA1 7fb7a1cb4ce15bf49be1876d3a10fe4e96ddcbe8 SHA256 5a62dd7a2398e50e29972a0ddca4e55f4a1840f37ca697cd4ea498f69a23a1b2
 MISC metadata.xml 647 RMD160 a50c408eb92b00628a99f69dd3d7845da9d9b794 SHA1 e6a729b1528e3c2c0653bad8b50e2291ddb2dabf SHA256 b4a43fb3d145d95a50c2612d43e69894277644779e734bf2f0d4c2d6579121f0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqfrRMACgkQu7rWomwgFXo5UwCdGX8ITDEouX2/mVjtXe/UIBRH
-/+cAoJ3uTSH6hcicQ5Qly32RS9gkYHeh
-=x+qV
------END PGP SIGNATURE-----
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 cf37f6792549..8572e76fb7d1 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.3 2009/09/03 11:48:22 ikelos Exp $
+# $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 $
 
 EAPI="2"
 inherit linux-info eutils
@@ -41,7 +41,7 @@ pkg_setup() {
 
 	linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
 		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
-		die "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_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 c0644b47e720..781f1d13404b 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.2 2009/09/03 11:48:22 ikelos Exp $
+# $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 $
 
 EAPI="2"
 inherit linux-info eutils
@@ -41,7 +41,7 @@ pkg_setup() {
 
 	linux_chkconfig_present "NF_CONNTRACK_IPV4" || \
 		linux_chkconfig_present "NF_CONNTRACK_IPV6" || \
-		die "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
+		ewarn "CONFIG_NF_CONNTRACK_IPV4 or CONFIG_NF_CONNTRACK_IPV6 " \
 			"are not set when one at least should be."
 }