Version bump (#266387).

(Portage version: 2.1.6.7/cvs/Linux x86_64)

4 files changed, 34 insertions, 37 deletions

diff --git a/net-proxy/squidclamav/ChangeLog b/net-proxy/squidclamav/ChangeLog
index e5f3109fd108..bef6f5ff1988 100644
--- a/net-proxy/squidclamav/ChangeLog
+++ b/net-proxy/squidclamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidclamav
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.8 2008/10/12 07:53:36 mrness Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.9 2009/04/25 09:44:42 mrness Exp $
+
+*squidclamav-4.0 (25 Apr 2009)
+
+  25 Apr 2009; Alin Năstac <mrness@gentoo.org>
+  -files/squidclamav-3.5-gentoo.patch, +files/squidclamav-4.0-gentoo.patch,
+  -squidclamav-3.5.ebuild, +squidclamav-4.0.ebuild:
+  Version bump (#266387).
 
 *squidclamav-3.6 (12 Oct 2008)
 
diff --git a/net-proxy/squidclamav/files/squidclamav-3.5-gentoo.patch b/net-proxy/squidclamav/files/squidclamav-3.5-gentoo.patch
deleted file mode 100644
index 169d84264e2b..000000000000
--- a/net-proxy/squidclamav/files/squidclamav-3.5-gentoo.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Nru squidclamav-3.5.orig/squidclamav.conf.dist squidclamav-3.5/squidclamav.conf.dist
---- squidclamav-3.5.orig/squidclamav.conf.dist	2008-03-28 10:51:18.000000000 +0200
-+++ squidclamav-3.5/squidclamav.conf.dist	2008-05-15 01:05:55.000000000 +0300
-@@ -29,7 +29,7 @@
- #
- #	stat 0|1
- #
--#	squidguard /usr/local/squidGuard/bin/squidGuard
-+#	squidguard /usr/bin/squidGuard
- #
- #	whitelist this.trustdomain.com
- #	whitelist .*\.domain\.*
-@@ -39,12 +39,12 @@
- #proxy http://127.0.0.1:3128/
- #logfile /var/log/squidclamav.log
- #redirect http://proxy.domain.com/cgi-bin/clwarn.cgi
--#squidguard /usr/local/squidGuard/bin/squidGuard
-+#squidguard /usr/bin/squidGuard
- #debug 0
- #force 1
- #stat 1
--#clamd_local /tmp/clamd
--#clamd_ip 192.168.1.5
-+#clamd_local /var/run/clamav/clamd.sock
-+#clamd_ip 127.0.0.1
- #clamd_port 3310
- #timeout 60
- #abort ^.*\.gz$
diff --git a/net-proxy/squidclamav/files/squidclamav-4.0-gentoo.patch b/net-proxy/squidclamav/files/squidclamav-4.0-gentoo.patch
new file mode 100644
index 000000000000..1e8ae2902f01
--- /dev/null
+++ b/net-proxy/squidclamav/files/squidclamav-4.0-gentoo.patch
@@ -0,0 +1,19 @@
+--- squidclamav-4.0/squidclamav.conf.dist	2009-03-04 16:51:08.000000000 +0100
++++ squidclamav-4.0/squidclamav.conf.dist.new	2009-04-16 13:52:58.000000000 +0200
+@@ -56,13 +56,13 @@
+ #squid_port 3128
+ #logfile /var/log/squidclamav.log
+ #redirect http://proxy.domain.com/cgi-bin/clwarn.cgi
+-#squidguard /usr/local/squidGuard/bin/squidGuard
++#squidguard /usr/bin/squidGuard
+ #debug 0
+ #force 1
+ #stat 1
+ #maxredir 10
+-#clamd_local /tmp/clamd
+-#clamd_ip 192.168.1.5
++#clamd_local /var/run/clamav/clamd.sock
++#clamd_ip 127.0.0.1
+ #clamd_port 3310
+ #timeout 60
+ #useragent Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)
diff --git a/net-proxy/squidclamav/squidclamav-3.5.ebuild b/net-proxy/squidclamav/squidclamav-4.0.ebuild
index dcbc94ff053e..c94576dd92b9 100644
--- a/net-proxy/squidclamav/squidclamav-3.5.ebuild
+++ b/net-proxy/squidclamav/squidclamav-4.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-3.5.ebuild,v 1.1 2008/05/14 22:10:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-4.0.ebuild,v 1.1 2009/04/25 09:44:42 mrness Exp $
+
+EAPI="2"
 
 inherit eutils
 
@@ -17,12 +19,9 @@ DEPEND="net-misc/curl
 	dev-libs/openssl
 	sys-libs/zlib
 	app-arch/bzip2"
-RDEPEND="${DEPEND}
-	net-proxy/squid"
-
-src_unpack() {
-	unpack ${A}
+RDEPEND="${DEPEND}"
 
+src_prepare() {
 	epatch "${FILESDIR}/${P}-gentoo.patch"
 }