added patch to work with 2.6.12/13 headers (bug #102813). Added check for existing installation (bug #102802). x86 and ppc keyworded 1.4

(Portage version: 2.0.51.22-r2)

4 files changed, 26 insertions, 8 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index ed80e78bd35f..acbf0741451f 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/l7-filter
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.15 2005/07/11 13:59:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.16 2005/08/20 04:37:19 dragonheart Exp $
+
+  20 Aug 2005; Daniel Black <dragonheart@gentoo.org> l7-filter-1.4.ebuild:
+  added patch to work with 2.6.12/13 headers (bug #102813). Added check for
+  existing installation (bug #102802). x86 and ppc keyworded 1.4
 
   11 Jul 2005; Simon Stelling <blubb@gentoo.org> l7-filter-1.4.ebuild:
   added ~amd64 keyword
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index f0278b648932..60efb45fcdcd 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -1,8 +1,8 @@
+MD5 8e91f5c410ede48248ed30091195c9d8 l7-filter-1.4.ebuild 2399
+MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 MD5 b929a5232ab0ffd2a1e60d13ae09b3db ChangeLog 2665
 MD5 403258fe9b30334286b62ac488a6086f l7-filter-0.9.1-r1.ebuild 2380
-MD5 7decf4d14f6197aeb23c0f45e5b2dc20 l7-filter-1.4.ebuild 2079
 MD5 4aeb2dca0ae76a5ff88e192e8a9f9636 l7-filter-1.2.ebuild 2071
-MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
+MD5 1900e66a8dde525ef974d0b0615218fc files/digest-l7-filter-1.4 147
 MD5 3b5e56dbb295b185a8c4dabd56868feb files/digest-l7-filter-0.9.1-r1 259
-MD5 609f7e0a2b3ac69f1f8f29c736096c88 files/digest-l7-filter-1.4 72
 MD5 69654182b56d25fafc1bd63eae5d35ee files/digest-l7-filter-1.2 72
diff --git a/net-misc/l7-filter/files/digest-l7-filter-1.4 b/net-misc/l7-filter/files/digest-l7-filter-1.4
index 39576b80888c..496deea271c1 100644
--- a/net-misc/l7-filter/files/digest-l7-filter-1.4
+++ b/net-misc/l7-filter/files/digest-l7-filter-1.4
@@ -1 +1,2 @@
 MD5 7ce3a8ca7635ffbd231cc061fad3c228 netfilter-layer7-v1.4.tar.gz 72293
+MD5 6e8ff4d1b7b0281a7596a74789b79f8d additional_patch_for_2.6.13.diff 4962
diff --git a/net-misc/l7-filter/l7-filter-1.4.ebuild b/net-misc/l7-filter/l7-filter-1.4.ebuild
index b850261888e5..9d30263014d6 100644
--- a/net-misc/l7-filter/l7-filter-1.4.ebuild
+++ b/net-misc/l7-filter/l7-filter-1.4.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.4.ebuild,v 1.4 2005/07/11 13:59:31 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.4.ebuild,v 1.5 2005/08/20 04:37:19 dragonheart Exp $
 
 inherit linux-info eutils
 
 MY_P=netfilter-layer7-v${PV}
 DESCRIPTION="Kernel modules for layer 7 iptables filtering"
 HOMEPAGE="http://l7-filter.sourceforge.net"
-SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/l7-filter/${MY_P}.tar.gz
+	mirror://sourceforge/l7-filter/additional_patch_for_2.6.13.diff"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ppc ~sparc x86"
 IUSE=""
 SLOT="${KV}"
 S=${WORKDIR}/${MY_P}
@@ -20,7 +21,13 @@ src_unpack() {
 
 	pkg_postinst
 
-	unpack ${A}
+	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
+	then
+		ewarn "already installed ${PF} for kernel ${KV_FULL}"
+		return 0;
+	fi
+
+	unpack ${MY_P}.tar.gz
 
 	cd ${S}
 
@@ -72,6 +79,12 @@ src_unpack() {
 	#patch the copied kernel source
 	cd ${S}/kernel
 	epatch ${S}/${PATCH}
+
+	# bug #102813
+	if kernel_is ge 2 6 11
+	then
+		epatch ${DISTDIR}/additional_patch_for_2.6.13.diff
+	fi
 }
 
 src_compile() {