Use eclass function for check and error message ;) and we're stable on x86 now

(Portage version: 2.1.2.3)

4 files changed, 21 insertions, 44 deletions

diff --git a/net-libs/libnetfilter_conntrack/ChangeLog b/net-libs/libnetfilter_conntrack/ChangeLog
index c81ba8d27c1e..b25e6cf7f4dd 100644
--- a/net-libs/libnetfilter_conntrack/ChangeLog
+++ b/net-libs/libnetfilter_conntrack/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libnetfilter_conntrack
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.5 2007/04/17 18:07:09 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/ChangeLog,v 1.6 2007/04/18 17:29:17 jokey Exp $
+
+  18 Apr 2007; Markus Ullmann <jokey@gentoo.org>
+  -libnetfilter_conntrack-0.0.31.ebuild,
+  libnetfilter_conntrack-0.0.50.ebuild:
+  Use eclass function for check and error message ;) and we're stable on x86 now
 
   17 Apr 2007; Cedric Krier <cedk@gentoo.org>
   libnetfilter_conntrack-0.0.50.ebuild:
diff --git a/net-libs/libnetfilter_conntrack/files/digest-libnetfilter_conntrack-0.0.31 b/net-libs/libnetfilter_conntrack/files/digest-libnetfilter_conntrack-0.0.31
deleted file mode 100644
index ac66e3cfb9a5..000000000000
--- a/net-libs/libnetfilter_conntrack/files/digest-libnetfilter_conntrack-0.0.31
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1871339b180b1b95a55517430bfb7d2b libnetfilter_conntrack-0.0.31.tar.bz2 223246
-RMD160 9760f5a93b4c9a21b4485ce07b67caccb2ab72c5 libnetfilter_conntrack-0.0.31.tar.bz2 223246
-SHA256 f91dcf1a9aa93c4371253b0a9b50c80a6bd7326283b60af8f3748466ad4d6bc4 libnetfilter_conntrack-0.0.31.tar.bz2 223246
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild
deleted file mode 100644
index b466bd68a5a6..000000000000
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.31.ebuild,v 1.1 2006/11/13 22:03:26 cedk Exp $
-
-inherit linux-info
-
-DESCRIPTION="programming interface (API) to the in-kernel connection tracking state table"
-HOMEPAGE="http://www.netfilter.org/projects/libnetfilter_conntrack/"
-SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="net-libs/libnfnetlink"
-RDEPEND=${DEPEND}
-
-CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild
index 2a5bb34d4069..2a14a0c004c1 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.4 2007/04/17 18:07:09 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-0.0.50.ebuild,v 1.5 2007/04/18 17:29:17 jokey Exp $
 
 inherit linux-info
 
@@ -10,24 +10,27 @@ SRC_URI="http://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 DEPEND=">=net-libs/libnfnetlink-0.0.25"
 RDEPEND=${DEPEND}
 
-CONFIG_CHECK="IP_NF_CONNTRACK_NETLINK"
-
 pkg_setup() {
-	kernel_is lt 2 6 14 && die "requires at least 2.6.14 kernel version"
-
-	einfo "Checking for suitable kernel configuration options..."
-	if ! linux_chkconfig_present "IP_NF_CONNTRACK_NETLINK" -a ! linux_chkconfig_present "NF_CT_NETLINK" ; then
-		eerror "Could not find IP_NF_CONNTRACK_NETLINK "
-		eerror "nor NF_CT_NETLINK in the kernel configuration"
-		eerror "Please check to make sure at least one of the options are set correctly."
-		die "Incorrect kernel configuration options"
+	linux-info_pkg_setup
+
+	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() {