Version bump as per bug #115022. Introduced better error messages to attempt to help unmerging (bugs like #110249)

(Portage version: 2.1_pre3)

7 files changed, 39 insertions, 34 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index 2d2bc14778b2..391c610cedc9 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,14 @@
 # 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.21 2005/10/02 13:55:22 dragonheart Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.22 2006/01/06 10:28:41 dragonheart Exp $
+
+*l7-filter-2.0 (06 Jan 2006)
+
+  06 Jan 2006; Daniel Black <dragonheart@gentoo.org> l7-filter-1.4.ebuild,
+  l7-filter-1.5.ebuild, -l7-filter-2.0_beta.ebuild, +l7-filter-2.0.ebuild:
+  Version bump as per bug #115022 thanks Nebojsa Trpkovic. Introduced better
+  error messages to attempt to help with bugs like #110249 thanks Bartosz
+  Krzeszewski
 
   02 Oct 2005; Daniel Black <dragonheart@gentoo.org> l7-filter-1.4.ebuild,
   l7-filter-2.0_beta.ebuild:
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index 7fd065852374..93b9d98528cb 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 db58c3533a3cc0f67b64312253707b79 l7-filter-1.4.ebuild 2917
-MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 MD5 4c6d5cb80062945d510e0ccc52d83509 ChangeLog 3945
-MD5 a463995d3bbc74163de05f2146962bd8 l7-filter-1.5.ebuild 2880
-MD5 d266b8e39ed8633fbfbecf6fdde97877 l7-filter-2.0_beta.ebuild 3213
 MD5 1900e66a8dde525ef974d0b0615218fc files/digest-l7-filter-1.4 147
 MD5 2d66a9bc9bf0c44d3ed5f5981eba4c3e files/digest-l7-filter-1.5 72
+MD5 18f7054eb701a222251a9711fc99f125 files/digest-l7-filter-2.0 147
 MD5 79eda629dc6521b2d9fc7443cffa279b files/digest-l7-filter-2.0_beta 152
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDP+bjmdTrptrqvGERAspXAJ4xpAdEJwddJMZgWMdEi0uW6sJI0QCeJkkA
-sqffdCDR/D2n+HfBKPmJRHc=
-=ZAsy
------END PGP SIGNATURE-----
+MD5 db58c3533a3cc0f67b64312253707b79 l7-filter-1.4.ebuild 2917
+MD5 a463995d3bbc74163de05f2146962bd8 l7-filter-1.5.ebuild 2880
+MD5 1f47a41df78c56264dcd9eb81a2a77af l7-filter-2.0.ebuild 3290
+MD5 d266b8e39ed8633fbfbecf6fdde97877 l7-filter-2.0_beta.ebuild 3213
+MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.0 b/net-misc/l7-filter/files/digest-l7-filter-2.0
new file mode 100644
index 000000000000..b47306a48d81
--- /dev/null
+++ b/net-misc/l7-filter/files/digest-l7-filter-2.0
@@ -0,0 +1,2 @@
+MD5 6e8ff4d1b7b0281a7596a74789b79f8d additional_patch_for_2.6.13.diff 4962
+MD5 dda42e68897845546e1b9715131c729b netfilter-layer7-v2.0.tar.gz 88489
diff --git a/net-misc/l7-filter/files/digest-l7-filter-2.0_beta b/net-misc/l7-filter/files/digest-l7-filter-2.0_beta
deleted file mode 100644
index 40e018569421..000000000000
--- a/net-misc/l7-filter/files/digest-l7-filter-2.0_beta
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6e8ff4d1b7b0281a7596a74789b79f8d additional_patch_for_2.6.13.diff 4962
-MD5 c760af92bc31c0fbd86faa3155e3f551 netfilter-layer7-v2.0-beta.tar.gz 88369
diff --git a/net-misc/l7-filter/l7-filter-1.4.ebuild b/net-misc/l7-filter/l7-filter-1.4.ebuild
index 9b75b83593c2..38e0c07e8ea5 100644
--- a/net-misc/l7-filter/l7-filter-1.4.ebuild
+++ b/net-misc/l7-filter/l7-filter-1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.8 2005/10/02 13:55:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.4.ebuild,v 1.9 2006/01/06 10:28:41 dragonheart Exp $
 
 inherit linux-info eutils
 
@@ -45,7 +45,10 @@ src_unpack() {
 
 	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
 	then
-		ewarn "already installed ${PF} for kernel ${KV_FULL}"
+		ewarn "already installed ${PN} for kernel ${KV_FULL}"
+		ewarn "If this is an upgrade attempt, try unmerging first."
+		ewarn "If this failes remove your kernel source from /usr/src"
+		ewarn "and remerge your kernel sources"
 		return 0;
 	fi
 
@@ -60,7 +63,7 @@ src_unpack() {
 
 	if [ ! -f ${PATCH} ];
 	then
-		die "Patch ${PATCH} fpr Kernel version ${KV_FULL} not supported"
+		die "Patch ${PATCH} for Kernel version ${KV_FULL} not supported"
 	fi
 
 	# create needed directories
diff --git a/net-misc/l7-filter/l7-filter-1.5.ebuild b/net-misc/l7-filter/l7-filter-1.5.ebuild
index 60636279209a..0a0ddf674d6a 100644
--- a/net-misc/l7-filter/l7-filter-1.5.ebuild
+++ b/net-misc/l7-filter/l7-filter-1.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.5.ebuild,v 1.1 2005/09/17 09:17:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-1.5.ebuild,v 1.2 2006/01/06 10:28:41 dragonheart Exp $
 
 inherit linux-info eutils
 
@@ -51,7 +51,10 @@ src_unpack() {
 
 	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
 	then
-		ewarn "already installed ${PF} for kernel ${KV_FULL}"
+		ewarn "already installed ${PN} for kernel ${KV_FULL}"
+		ewarn "If this is an upgrade attempt, try unmerging first."
+		ewarn "If this failes remove your kernel source from /usr/src"
+		ewarn "and remerge your kernel sources"
 		return 0;
 	fi
 
diff --git a/net-misc/l7-filter/l7-filter-2.0_beta.ebuild b/net-misc/l7-filter/l7-filter-2.0.ebuild
index cd220e616897..a9d1d952eaf9 100644
--- a/net-misc/l7-filter/l7-filter-2.0_beta.ebuild
+++ b/net-misc/l7-filter/l7-filter-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.0_beta.ebuild,v 1.2 2005/10/02 13:55:22 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.0.ebuild,v 1.1 2006/01/06 10:28:41 dragonheart Exp $
 
 inherit linux-info eutils
 
@@ -23,17 +23,13 @@ RDEPEND="net-misc/l7-protocols"
 which_patch() {
 	if kernel_is ge 2 6 13
 	then
-		PATCH=kernel-2.6.13-layer7-2.0.patch
+		PATCH=kernel-2.6.13-2.6.14-layer7-2.0.patch
 	elif kernel_is ge 2 6 11
 	then
 		PATCH=for_older_kernels/kernel-2.6.11-2.6.12-layer7-1.4.patch
 	elif kernel_is ge 2 6 9
 	then
 		PATCH=for_older_kernels/kernel-2.6.9-2.6.10-layer7-1.2.patch
-	elif kernel_is 2 6
-	then
-		# 2.6.0-2.6.8.1
-		PATCH=for_older_kernels/kernel-2.6.0-2.6.8.1-layer7-0.9.2.patch
 	elif kernel_is 2 4
 	then
 		PATCH=kernel-2.4-layer7-2.0.patch
@@ -52,7 +48,10 @@ src_unpack() {
 
 	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
 	then
-		ewarn "already installed ${PF} for kernel ${KV_FULL}"
+		ewarn "already installed ${PN} for kernel ${KV_FULL}"
+		ewarn "If this is an upgrade attempt, try unmerging first."
+		ewarn "If this failes remove your kernel source from /usr/src"
+		ewarn "and remerge your kernel sources"
 		return 0;
 	fi
 
@@ -119,7 +118,7 @@ pkg_postinst() {
 pkg_prerm() {
 	if [ -f ${ROOT}/usr/src/linux/include/linux/netfilter_ipv4/ipt_layer7.h ]
 	then
-		einfo 'attempting to unpatch l7-patch from kernel'
+		einfo 'attempting to unpatch l7-patch from kernel ${KV_FULL}'
 		which_patch
 		if kernel_is eq 2 6 12
 		then