Fix check for more recent kernels per bug #174706 thanks to Olivier Huber and stable...

Package-Manager: portage-2.1.2.3

diff --git a/net-firewall/conntrack/ChangeLog b/net-firewall/conntrack/ChangeLog
index 95419fc8a1b8b70ec32578a8e38d1c202f2bc68f..3f378185c433ec9faf2f49597c4e749207b83659 100644 (file)
--- a/net-firewall/conntrack/ChangeLog
+++ b/net-firewall/conntrack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/conntrack
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/ChangeLog,v 1.1 2006/11/25 15:56:24 cedk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/ChangeLog,v 1.2 2007/04/18 17:32:52 jokey Exp $
+
+  18 Apr 2007; Markus Ullmann <jokey@gentoo.org>
+  conntrack-1.00_beta2.ebuild:
+  Fix check for more recent kernels per bug #174706 thanks to Olivier Huber
+  and stable on x86
 
 *conntrack-1.00_beta2 (25 Nov 2006)
 

diff --git a/net-firewall/conntrack/Manifest b/net-firewall/conntrack/Manifest
index d83ee346e63732f9bf1235bbb9dcd2692e4daa06..ea5981ddf6649e3c84adfe12b553cc81f2d146be 100644 (file)
--- a/net-firewall/conntrack/Manifest
+++ b/net-firewall/conntrack/Manifest
@@ -1,12 +1,12 @@
 DIST conntrack-1.00beta2.tar.bz2 225887 RMD160 700b2f27e30c86aa615dca4494a98069d550eae2 SHA1 e8f7c310135ed83fe91fd1f54c321ff7bf1430af SHA256 7e01781be952bb37115182e66a21aceb8b4428c93dd19a59d2f28c01473e15b1
-EBUILD conntrack-1.00_beta2.ebuild 888 RMD160 d0f5eafc73ecd24e826fc97e92cb9eff41dace04 SHA1 896736b920378f9eb8cf2542c60369e05acc40d7 SHA256 0fbc341f9b0b9c5f1f0ea54a59914f3c06772d8d2152c21f03ca024cd5bcc893
-MD5 c82b90878f057ff87f330062e30ab8b1 conntrack-1.00_beta2.ebuild 888
-RMD160 d0f5eafc73ecd24e826fc97e92cb9eff41dace04 conntrack-1.00_beta2.ebuild 888
-SHA256 0fbc341f9b0b9c5f1f0ea54a59914f3c06772d8d2152c21f03ca024cd5bcc893 conntrack-1.00_beta2.ebuild 888
-MISC ChangeLog 375 RMD160 5b65f3fbaf3869b95d3d6d73e14c7bbc0526f95e SHA1 0e49071416b8634a3c57318580cb7416f505dd10 SHA256 a029cbcf679357c812f54660e0005722f72fd0e7d3cfce383c0dd81c5024a480
-MD5 aa3428a164357a9330d95cb16594c061 ChangeLog 375
-RMD160 5b65f3fbaf3869b95d3d6d73e14c7bbc0526f95e ChangeLog 375
-SHA256 a029cbcf679357c812f54660e0005722f72fd0e7d3cfce383c0dd81c5024a480 ChangeLog 375
+EBUILD conntrack-1.00_beta2.ebuild 1072 RMD160 52128de5ea761b42660336c4a2adfeccf3bde834 SHA1 d5415b060302e95f0d5c7f65ed14f0c5bf161628 SHA256 b486f71161f87b34598aec6ae4fb709ed1b9ea3eb783dc40003c612c75bd2892
+MD5 a286bb0ec963ebb0476e3be028f8f1bf conntrack-1.00_beta2.ebuild 1072
+RMD160 52128de5ea761b42660336c4a2adfeccf3bde834 conntrack-1.00_beta2.ebuild 1072
+SHA256 b486f71161f87b34598aec6ae4fb709ed1b9ea3eb783dc40003c612c75bd2892 conntrack-1.00_beta2.ebuild 1072
+MISC ChangeLog 553 RMD160 1c2d64f73c0c8cc0fee40a7b66e4554c9fa73436 SHA1 ffaebc3d1a45bc55df369d732fcf2bfc6df859e6 SHA256 6d1412b3af1c60c00c8bfa7e495781a1388fa58c88736636a638c44f1209fcd2
+MD5 8fd114879230a9c6cd3d439e1a3c6ec9 ChangeLog 553
+RMD160 1c2d64f73c0c8cc0fee40a7b66e4554c9fa73436 ChangeLog 553
+SHA256 6d1412b3af1c60c00c8bfa7e495781a1388fa58c88736636a638c44f1209fcd2 ChangeLog 553
 MISC metadata.xml 256 RMD160 9bbe06ae3be5c10958a6ca0f694e3caf86f42f4f SHA1 4557cf05a753093eb29d4e5aefeff46a61cc34d3 SHA256 381f7b5505232fe364445b879b4fc7616b34d94e6514eae7ce4a0ad4064757ed
 MD5 7a0a4bd895b8da9a2e92e4de62141c27 metadata.xml 256
 RMD160 9bbe06ae3be5c10958a6ca0f694e3caf86f42f4f metadata.xml 256

diff --git a/net-firewall/conntrack/conntrack-1.00_beta2.ebuild b/net-firewall/conntrack/conntrack-1.00_beta2.ebuild
index 66be213bfd39be3caa7a37f04a489d51f2ccb48a..2ac5d8464c841b4de5d9121e1ceda5ff8b3c82b1 100644 (file)
--- a/net-firewall/conntrack/conntrack-1.00_beta2.ebuild
+++ b/net-firewall/conntrack/conntrack-1.00_beta2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/conntrack-1.00_beta2.ebuild,v 1.1 2006/11/25 15:56:24 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/conntrack/conntrack-1.00_beta2.ebuild,v 1.2 2007/04/18 17:32:52 jokey Exp $
 
 inherit linux-info
 
@@ -8,11 +8,11 @@ MY_P="${P/_}"
 
 DESCRIPTION="view and manage the in-kernel connection tracking state table"
 HOMEPAGE="http://www.netfilter.org/projects/conntrack/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${MY_P}.tar.bz2"
+SRC_URI="http://www.netfilter.org/projects/conntrack/files/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="net-libs/libnfnetlink
@@ -21,11 +21,21 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-
 pkg_setup() {
        linux-info_pkg_setup
-       kernel_is lt 2 6 14 && die "${PN} requires at least 2.6.14 kernel version"
+
+       if kernel_is lt 2 6 14 ; then
+               die "${PN} requires at least 2.6.14 kernel version"
+       fi
+
+       #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"
+       else
+               CONFIG_CHECK="NF_CT_NETLINK"
+       fi
+
+       check_extra_config
 }
 
 src_install() {