Making CONFIG_CHECK non-fatal for userland ebuilds, see bug 283320.

(Portage version: 2.2_rc40/cvs/Linux i686)

6 files changed, 33 insertions, 27 deletions

diff --git a/net-firewall/conntrack-tools/ChangeLog b/net-firewall/conntrack-tools/ChangeLog
index 1ecea768c708..a7659bf0b69f 100644
--- a/net-firewall/conntrack-tools/ChangeLog
+++ b/net-firewall/conntrack-tools/ChangeLog
@@ -1,6 +1,12 @@
 # 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.32 2009/07/26 19:14:48 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/ChangeLog,v 1.33 2009/09/03 11:48:22 ikelos Exp $
+
+  03 Sep 2009; Mike Auty <ikelos@gentoo.org>
+  conntrack-tools-0.9.6-r1.ebuild, conntrack-tools-0.9.9.ebuild,
+  conntrack-tools-0.9.11.ebuild, conntrack-tools-0.9.12.ebuild,
+  conntrack-tools-0.9.13.ebuild:
+  Making CONFIG_CHECK non-fatal for userland ebuilds, see bug 283320.
 
 *conntrack-tools-0.9.13 (26 Jul 2009)
 
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
index 45bac509bd75..0fa367538274 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.11.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.11.ebuild,v 1.2 2009/03/08 13:47:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.11.ebuild,v 1.3 2009/09/03 11:48:22 ikelos Exp $
 
 EAPI="2"
 inherit linux-info eutils
@@ -30,12 +30,12 @@ pkg_setup() {
 
 	#netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
-		CONFIG_CHECK="NF_CT_NETLINK"
+		CONFIG_CHECK="~NF_CT_NETLINK"
 	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK ~NF_CONNTRACK_IPV4
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
 
 	check_extra_config
 }
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 a49683a8e8ae..cf37f6792549 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.2 2009/04/15 21:46:58 cedk Exp $
+# $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 $
 
 EAPI="2"
 inherit linux-info eutils
@@ -30,12 +30,12 @@ pkg_setup() {
 
 	#netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
-		CONFIG_CHECK="NF_CT_NETLINK"
+		CONFIG_CHECK="~NF_CT_NETLINK"
 	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
 
 	check_extra_config
 
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 8c7f90ea95a5..c0644b47e720 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.1 2009/07/26 19:14:48 cedk Exp $
+# $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 $
 
 EAPI="2"
 inherit linux-info eutils
@@ -30,12 +30,12 @@ pkg_setup() {
 
 	#netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
-		CONFIG_CHECK="NF_CT_NETLINK"
+		CONFIG_CHECK="~NF_CT_NETLINK"
 	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
 
 	check_extra_config
 
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild
index 8be03aa96fad..14075900db7b 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.6-r1.ebuild,v 1.8 2008/11/27 18:55:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.6-r1.ebuild,v 1.9 2009/09/03 11:48:22 ikelos Exp $
 
 inherit linux-info
 
@@ -35,12 +35,12 @@ pkg_setup() {
 
 	#netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
-		CONFIG_CHECK="NF_CT_NETLINK"
+		CONFIG_CHECK="~NF_CT_NETLINK"
 	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK ~NF_CONNTRACK_IPV4
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
 
 	check_extra_config
 }
diff --git a/net-firewall/conntrack-tools/conntrack-tools-0.9.9.ebuild b/net-firewall/conntrack-tools/conntrack-tools-0.9.9.ebuild
index 182579e675f8..af2280eb0dc9 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-0.9.9.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-0.9.9.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.9.ebuild,v 1.4 2009/03/03 15:11:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack-tools/conntrack-tools-0.9.9.ebuild,v 1.5 2009/09/03 11:48:22 ikelos Exp $
 
 inherit linux-info eutils
 
@@ -29,12 +29,12 @@ pkg_setup() {
 
 	#netfilter core team has changed some option names with kernel 2.6.20
 	if kernel_is lt 2 6 20 ; then
-		CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
+		CONFIG_CHECK="~IP_NF_CONNTRACK_NETLINK"
 	else
-		CONFIG_CHECK="NF_CT_NETLINK"
+		CONFIG_CHECK="~NF_CT_NETLINK"
 	fi
-	CONFIG_CHECK="${CONFIG_CHECK} NF_CONNTRACK NF_CONNTRACK_IPV4
-		NETFILTER_NETLINK NF_CONNTRACK_EVENTS"
+	CONFIG_CHECK="${CONFIG_CHECK} ~NF_CONNTRACK ~NF_CONNTRACK_IPV4
+		~NETFILTER_NETLINK ~NF_CONNTRACK_EVENTS"
 
 	check_extra_config
 }