fix clean up a bit

Package-Manager: portage-2.1.2.7

3 files changed, 27 insertions, 13 deletions

diff --git a/net-misc/l7-filter/ChangeLog b/net-misc/l7-filter/ChangeLog
index fc640dbf4bd5..62b672f9a6cc 100644
--- a/net-misc/l7-filter/ChangeLog
+++ b/net-misc/l7-filter/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/l7-filter
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.48 2007/07/07 00:31:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/ChangeLog,v 1.49 2007/07/07 01:59:50 dragonheart Exp $
+
+  07 Jul 2007; Daniel Black <dragonheart@gentoo.org> l7-filter-2.12.ebuild:
+  fix clean up a bit
 
 *l7-filter-2.12 (07 Jul 2007)
 
diff --git a/net-misc/l7-filter/Manifest b/net-misc/l7-filter/Manifest
index fc148de520dd..041553beee7a 100644
--- a/net-misc/l7-filter/Manifest
+++ b/net-misc/l7-filter/Manifest
@@ -2,10 +2,10 @@ DIST additional_patch_for_2.6.13.diff 4962 RMD160 8faa60214d5695c797b24a11fe9585
 DIST netfilter-layer7-v2.12.tar.gz 160071 RMD160 a9e5ae2650837f64564e27daf6c3c0652c97bd55 SHA1 f3121f04473c78334a800170c23d584009b0de6b SHA256 1ea9c8952e70a1a43d8bdf30478d46ce9d10a0a77b0bca99e6931deb6d753b6d
 DIST netfilter-layer7-v2.8.tar.gz 122377 RMD160 cd70ce6c0631d5099d44f52a06414562552fb546 SHA1 6f2cdcb69bd61b2971603cb7ed5f4da16df79d7e SHA256 09ecd9a000ab7595694b85f2bc9fa2b2f5bd8debd36c78fe5564fd23bdbbe9f3
 DIST netfilter-layer7-v2.9.tar.gz 122497 RMD160 0398b8b61b24eb5d28309a53af0279e9f201318d SHA1 c4a1d92855ad51413fbd7229fe9decfe45aac084 SHA256 7db0e22297f7ecec41bb973733d6970bab922b4c54f779239616fa26a2315969
-EBUILD l7-filter-2.12.ebuild 4742 RMD160 a442c7183912ebdb658d6ba7c1c7e66378e7997d SHA1 ae7c61def3fee641af6f843c4a82a8c4f48ac24b SHA256 ae65b6ad30ad926e75a60a757de34a61d73776ac11d531a08bae08e6dec4320c
-MD5 4c54780e1cdcee30f1cf1c505e5ce13f l7-filter-2.12.ebuild 4742
-RMD160 a442c7183912ebdb658d6ba7c1c7e66378e7997d l7-filter-2.12.ebuild 4742
-SHA256 ae65b6ad30ad926e75a60a757de34a61d73776ac11d531a08bae08e6dec4320c l7-filter-2.12.ebuild 4742
+EBUILD l7-filter-2.12.ebuild 5250 RMD160 80aca8198d418d0dd7cdaedbf8910cc7c3ea81f1 SHA1 5012fe3edb1701268be6558c3f2a2ff87fe38add SHA256 bbef3899719ff1999b4704cd4aa59decf1299d8aab264130076fa9f60d531950
+MD5 1a036562e4e4f044dee3b83b648f5898 l7-filter-2.12.ebuild 5250
+RMD160 80aca8198d418d0dd7cdaedbf8910cc7c3ea81f1 l7-filter-2.12.ebuild 5250
+SHA256 bbef3899719ff1999b4704cd4aa59decf1299d8aab264130076fa9f60d531950 l7-filter-2.12.ebuild 5250
 EBUILD l7-filter-2.8.ebuild 4308 RMD160 d506aa24caa67bc140b6ee220d8356d86147e884 SHA1 8f76f04140119664cc9f6db2801a04a9f63560c0 SHA256 abd8f30b4fe0e14d8ba2b9e8b8c1e75c7e8a8d8ce721e243d025e5cae6df04ef
 MD5 dbea47b5cedbdbff036edb8bf1893c06 l7-filter-2.8.ebuild 4308
 RMD160 d506aa24caa67bc140b6ee220d8356d86147e884 l7-filter-2.8.ebuild 4308
@@ -14,10 +14,10 @@ EBUILD l7-filter-2.9.ebuild 4326 RMD160 89a567660dcd9f518322e0e46b724c712afcd15e
 MD5 542b497ba474ed7db95e7fedfea898ea l7-filter-2.9.ebuild 4326
 RMD160 89a567660dcd9f518322e0e46b724c712afcd15e l7-filter-2.9.ebuild 4326
 SHA256 d4550dd29db3e2bea81ac6c10149a01b388d9b3f66b956fe8628653fdd754364 l7-filter-2.9.ebuild 4326
-MISC ChangeLog 8132 RMD160 888ad6734aa61e0453085e2ff8fc772e80fb42b1 SHA1 f450301f87f6bc68424f76e47e3f8d5bba339ae5 SHA256 6bc4465cfd6767e7339409f5ccf6c59c0707a1414d1ba15af58acf799ea9614e
-MD5 3836c223e481f1a6d8464d9c3c110273 ChangeLog 8132
-RMD160 888ad6734aa61e0453085e2ff8fc772e80fb42b1 ChangeLog 8132
-SHA256 6bc4465cfd6767e7339409f5ccf6c59c0707a1414d1ba15af58acf799ea9614e ChangeLog 8132
+MISC ChangeLog 8230 RMD160 31682c6d5cd173f3bc4e6918c524a854d91436e8 SHA1 1d7211947bb3a7355bdff3eca5d0a65a53727a66 SHA256 a2b67400d0618ca10e5bc942a3b23d8779dbef53a78a827fb56497f1a87dcb84
+MD5 7781e24eb5bf609766646176a1ed5739 ChangeLog 8230
+RMD160 31682c6d5cd173f3bc4e6918c524a854d91436e8 ChangeLog 8230
+SHA256 a2b67400d0618ca10e5bc942a3b23d8779dbef53a78a827fb56497f1a87dcb84 ChangeLog 8230
 MISC metadata.xml 374 RMD160 36c7b587b04bba133b9b106083dd7b485d9d2e45 SHA1 1d33c3e413603911ecb01f7a6ac8bb89c544562b SHA256 4638653661df3aa277ddfab4579d87598d17211e8b4d10114d4eeba5ddf2b7f1
 MD5 89edb769612add8464eb3c324f09e197 metadata.xml 374
 RMD160 36c7b587b04bba133b9b106083dd7b485d9d2e45 metadata.xml 374
diff --git a/net-misc/l7-filter/l7-filter-2.12.ebuild b/net-misc/l7-filter/l7-filter-2.12.ebuild
index 53436623667f..3fe6f6404fdf 100644
--- a/net-misc/l7-filter/l7-filter-2.12.ebuild
+++ b/net-misc/l7-filter/l7-filter-2.12.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-misc/l7-filter/l7-filter-2.12.ebuild,v 1.1 2007/07/07 00:31:11 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/l7-filter/l7-filter-2.12.ebuild,v 1.2 2007/07/07 01:59:50 dragonheart Exp $
 
 inherit linux-info eutils
 
@@ -153,15 +153,26 @@ pkg_postinst() {
 
 pkg_prerm() {
 	# How to determine what version it was installed against? - measily
-	eval $(/bin/fgrep KV=2 ${ROOT}/var/db/pkg/net-misc/${PF}/environment |\
-		/bin/head -1)
+	if [ -f ${ROOT}/var/db/pkg/net-misc/${PF}/environment ]; then
+		eval $(/bin/fgrep KV=2 ${ROOT}/var/db/pkg/net-misc/${PF}/environment |\
+			/bin/head -1)
+	elif [ -f ${ROOT}/var/db/pkg/net-misc/${PF}/environment.bz2 ]; then
+		eval $(/bin/bzfgrep KV=2 ${ROOT}/var/db/pkg/net-misc/${PF}/environment.bz2 |\
+			/bin/head -1)
+	elif [ -f ${ROOT}/var/db/pkg/net-misc/${PF}/environment.gz ]; then
+		eval $(/usr/bin/zfgrep KV=2	${ROOT}/var/db/pkg/net-misc/${PF}/environment.gz |\
+			/bin/head -1)
+	else
+		die 'could not find previous version'
+	fi
 	KV_DIR=/usr/src/linux-"${KV}"
 	if [ -d  ${KV_DIR} ]; then
 		ewarn "${KV_DIR} nolonger exists"
 		return 0;
 	fi
 	echo "KV_DIR=$KV_DIR"
-	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ]
+	if [ -f ${KV_DIR}/include/linux/netfilter_ipv4/ipt_layer7.h ] || \
+		[ -f ${KV_DIR}/include/linux/netfilter/xt_layer7.h ]
 	then
 		einfo 'attempting to unpatch l7-patch from kernel ${KV_FULL}'
 		which_patch