--- /usr/portage/net-firewall/firehol/firehol-1.256-r1.ebuild	2008-09-27 15:06:25.000000000 +0100
+++ firehol-1.273.ebuild	2008-10-13 01:57:51.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/firehol/firehol-1.256-r1.ebuild,v 1.3 2008/09/27 13:37:48 betelgeuse Exp $
+# $Header: $
 
 EAPI=2
 
@@ -24,29 +24,23 @@
 		net-misc/curl
 	)"
 
-#S="${WORKDIR}/${PN}-1.226"
-
 pkg_setup() {
 	# perform checks for kernel config from eclass linux-info
 	# for now we just print warnings as I am not sure if these
 	# are required always...
-	CONFIG_CHECK="~NF_CONNTRACK_ENABLED ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK ~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT ~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG ~NF_NAT ~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE"
+	local KCONFIG_OPTS="~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_MARK \
+		~IP_NF_IPTABLES ~IP_NF_FILTER ~IP_NF_TARGET_REJECT \
+		~IP_NF_TARGET_LOG ~IP_NF_TARGET_ULOG ~NF_NAT \
+		~IP_NF_TARGET_MASQUERADE ~IP_NF_TARGET_REDIRECT ~IP_NF_MANGLE"
+	get_version
+	if [ ${KV_PATCH} -ge 25 ]; then
+		CONFIG_CHECK="~NF_CONNTRACK ${KCONFIG_OPTS}"
+	else
+		CONFIG_CHECK="~NF_CONNTRACK_ENABLED ${KCONFIG_OPTS}"
+	fi
 	linux-info_pkg_setup
 }
 
-# patch for embedded Gentoo - GNAP
-# backport from firehol-CVS.
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	# not needed any more according to http://bugs.gentoo.org/show_bug.cgi?id=172000#c15
-	#epatch ${FILESDIR}/${P}-printf.patch || die
-
-	# Bug 195378, binary is called zcat instead of gzcat, fixed upstream in later releases
-	sed -i -e 's/gzcat/zcat/g' firehol.sh || die
-	sed -i -e 's/GZCAT/ZCAT/g' firehol.sh || die
-}
-
 src_install() {
 	newsbin firehol.sh firehol