Remove old version. Version bump.

Package-Manager: portage-2.1.3.19

7 files changed, 62 insertions, 48 deletions

diff --git a/net-proxy/squidclamav/ChangeLog b/net-proxy/squidclamav/ChangeLog
index 5958e3b224a7..e4ff8f1e09e0 100644
--- a/net-proxy/squidclamav/ChangeLog
+++ b/net-proxy/squidclamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-proxy/squidclamav
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.4 2007/11/02 15:49:01 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/ChangeLog,v 1.5 2007/12/30 12:16:37 mrness Exp $
+
+*squidclamav-3.2 (30 Dec 2007)
+
+  30 Dec 2007; Alin Năstac <mrness@gentoo.org>
+  -files/squidclamav-3.0-gentoo.patch, +files/squidclamav-3.2-gentoo.patch,
+  -squidclamav-3.0.ebuild, +squidclamav-3.2.ebuild:
+  Remove old version. Version bump.
 
 *squidclamav-3.1 (02 Nov 2007)
 
diff --git a/net-proxy/squidclamav/Manifest b/net-proxy/squidclamav/Manifest
index 81b7213156df..57a992473751 100644
--- a/net-proxy/squidclamav/Manifest
+++ b/net-proxy/squidclamav/Manifest
@@ -1,42 +1,42 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX squidclamav-3.0-gentoo.patch 661 RMD160 8f972f27c37a76dc955a289266ddfc461227f9fd SHA1 8790331ee7c8de74957417066fb6dbbcfe170f9e SHA256 9bf7e316520ffedc322fecf7d3f9eed31b18aaf5ca3f8ec73dd320d77e444528
-MD5 8e1662e9916165026ef30be441b2aabf files/squidclamav-3.0-gentoo.patch 661
-RMD160 8f972f27c37a76dc955a289266ddfc461227f9fd files/squidclamav-3.0-gentoo.patch 661
-SHA256 9bf7e316520ffedc322fecf7d3f9eed31b18aaf5ca3f8ec73dd320d77e444528 files/squidclamav-3.0-gentoo.patch 661
 AUX squidclamav-3.1-gentoo.patch 847 RMD160 b381fc967d7e1d0f8537ae9f8a4f9c3e83a9391c SHA1 69b04c8b238f40e1e7075dd8ad07bb1e947a9210 SHA256 e67c81508c3e76bb63f46e1075747a5a38519d19f2a2d86de6a5aaa66e93d173
 MD5 668a23f4354b7ff40f1dd210e37fa691 files/squidclamav-3.1-gentoo.patch 847
 RMD160 b381fc967d7e1d0f8537ae9f8a4f9c3e83a9391c files/squidclamav-3.1-gentoo.patch 847
 SHA256 e67c81508c3e76bb63f46e1075747a5a38519d19f2a2d86de6a5aaa66e93d173 files/squidclamav-3.1-gentoo.patch 847
-DIST squidclamav-3.0.tar.gz 128954 RMD160 7d24d0a3c722413a666a0a4ee82c3b1e3e2357b4 SHA1 8fbfa33392a3b403739041c8fd023c63740462cb SHA256 190f62280bbef6a38da1cfcf16ba1158bb65a5be7e18221f83565ca701c3a3b6
+AUX squidclamav-3.2-gentoo.patch 847 RMD160 449bbd6b11238e233642d2bf1e56064491ce8ea3 SHA1 c41a8546b23422e27afcc41e665482c9c6f98179 SHA256 cac71f7cb4d72fa21926ec2d999f10073c585e66827131c989f5ac54280ec070
+MD5 6fdf4878feda8fc1fe9d5e1916e2bdca files/squidclamav-3.2-gentoo.patch 847
+RMD160 449bbd6b11238e233642d2bf1e56064491ce8ea3 files/squidclamav-3.2-gentoo.patch 847
+SHA256 cac71f7cb4d72fa21926ec2d999f10073c585e66827131c989f5ac54280ec070 files/squidclamav-3.2-gentoo.patch 847
 DIST squidclamav-3.1.tar.gz 118434 RMD160 5431089570712111db13c8ea37fdabf1002a1ab2 SHA1 0832fc530fc11b967443a71ee899361b4d3b9a42 SHA256 17b634239e1750e85253420f886a2b436621fc0ea8d992e058c03ec6d5c86f82
-EBUILD squidclamav-3.0.ebuild 1247 RMD160 da2e6caf701b852dae0908e3967128e3c0d18495 SHA1 58a81bcd051b47dade3733f31e6fef1f525dfc18 SHA256 aee14714a70ebb30184d41163e05b595e4bbe8317415cfc6b5b992736811e2bb
-MD5 8b392f7a40e1e5816c6e247c16d4f8a9 squidclamav-3.0.ebuild 1247
-RMD160 da2e6caf701b852dae0908e3967128e3c0d18495 squidclamav-3.0.ebuild 1247
-SHA256 aee14714a70ebb30184d41163e05b595e4bbe8317415cfc6b5b992736811e2bb squidclamav-3.0.ebuild 1247
+DIST squidclamav-3.2.tar.gz 118542 RMD160 c6d2de7cd9c43ca0fceb80ba13e01268ad3de301 SHA1 5502fe96a945d509bda937fc0c0eeb0625fb022d SHA256 01c1077e9265d636c265f1f6ced8ca019e205325abff6b6737cb169b2e819143
 EBUILD squidclamav-3.1.ebuild 1248 RMD160 ccc3e13e25cf574aa0017cd8e525d51c6d1c5a1a SHA1 965881b4a143d89eebcfb0892038c82cec52b0a6 SHA256 b885173dfb01b3c6f30b553b01cef9cd0b4a489689f792f3ccb6b54409163fd6
 MD5 4d927bd0b70b251ba85352a3a4cbd5ab squidclamav-3.1.ebuild 1248
 RMD160 ccc3e13e25cf574aa0017cd8e525d51c6d1c5a1a squidclamav-3.1.ebuild 1248
 SHA256 b885173dfb01b3c6f30b553b01cef9cd0b4a489689f792f3ccb6b54409163fd6 squidclamav-3.1.ebuild 1248
-MISC ChangeLog 814 RMD160 9797e7bbbf1dcede1d3eb10db79db7963e573dd8 SHA1 68bf8eec84bae5e82bf4e5a0d91a95713bb09e27 SHA256 13abfa0349f8f89a1676c5cd55cd7b488c3fea1e98d309a2dc611ad97d66d994
-MD5 00fd977d162b795be1d95114ce17e896 ChangeLog 814
-RMD160 9797e7bbbf1dcede1d3eb10db79db7963e573dd8 ChangeLog 814
-SHA256 13abfa0349f8f89a1676c5cd55cd7b488c3fea1e98d309a2dc611ad97d66d994 ChangeLog 814
+EBUILD squidclamav-3.2.ebuild 1239 RMD160 60beaf3b88042be2cd6e902db64df60007259b20 SHA1 9cb8fff32a74fee3efdd29c6e19271d4d1892045 SHA256 ba66ea937d2e7656232a6930807407f45eed535d1c5fb70ac06a066f350fbb70
+MD5 5504d41032e0a1c90f4bba3c01f38d80 squidclamav-3.2.ebuild 1239
+RMD160 60beaf3b88042be2cd6e902db64df60007259b20 squidclamav-3.2.ebuild 1239
+SHA256 ba66ea937d2e7656232a6930807407f45eed535d1c5fb70ac06a066f350fbb70 squidclamav-3.2.ebuild 1239
+MISC ChangeLog 1059 RMD160 95895fe961506a14386b7b62f1a67e10a1368f78 SHA1 92a9731b8f79f3a4510d47a9a1e2ec0eac1edd47 SHA256 d191d9662ff0c4c832ce54274f6fddb16fb51578da799f0eb482b1eccf8f5611
+MD5 ebc53122344c892bfd2d1df7cacd34d8 ChangeLog 1059
+RMD160 95895fe961506a14386b7b62f1a67e10a1368f78 ChangeLog 1059
+SHA256 d191d9662ff0c4c832ce54274f6fddb16fb51578da799f0eb482b1eccf8f5611 ChangeLog 1059
 MISC metadata.xml 327 RMD160 f8064541c8e6cb884bc8742791f177f1fa5bafcf SHA1 c19339e33115e3eec128917cfdf1645d4f06e001 SHA256 e36b5b3fe77428545f7ae44d2f036f11dcbd84a6391e5c6d691ac1698d46af71
 MD5 e326529b235145b7616df6fde4656721 metadata.xml 327
 RMD160 f8064541c8e6cb884bc8742791f177f1fa5bafcf metadata.xml 327
 SHA256 e36b5b3fe77428545f7ae44d2f036f11dcbd84a6391e5c6d691ac1698d46af71 metadata.xml 327
-MD5 bd82363bdd4b1baaacd4eef70943a237 files/digest-squidclamav-3.0 247
-RMD160 63c23fb9423e9a0c9629ba16321b21cdc2f658d1 files/digest-squidclamav-3.0 247
-SHA256 1c2effbf3d4a6b9fa48a427e76f31a73efe68e712e3644d7c56ab5fb72b0a5b7 files/digest-squidclamav-3.0 247
 MD5 511a7f3f342c5a7985602006d5b78d5d files/digest-squidclamav-3.1 247
 RMD160 1e8d9bc4c262ff3b1cbece36a9f52020d8ed7f1f files/digest-squidclamav-3.1 247
 SHA256 c1f3bffc19653b377391a6da5ff6c65f65b1f9f04a19c55e9814199bff9bcba8 files/digest-squidclamav-3.1 247
+MD5 351b982e8467418722caa9a16e430886 files/digest-squidclamav-3.2 247
+RMD160 63a1c00eaf909ca186be633d536f0ed5b2e88f7e files/digest-squidclamav-3.2 247
+SHA256 b88269675d0014d2fa4fa58cd198e2033056ae8a49a3ca6b902bc63d3e007fa4 files/digest-squidclamav-3.2 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHK0b4VSA5X31g7/gRAt07AJoDNjfq0GgeHiLlY7GqFOwON201WwCfZfEh
-SXfUrfY1e6PSdP6otSIs2Kw=
-=ZMdP
+iEYEARECAAYFAkd3jC4ACgkQ+fWpoTWIA9GC8wCfdbNnnStXIQVrl8ySZ4lnZeHu
+Z9UAn1frUpEN/7VKcvntC60Kn9PbazbX
+=DzfK
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/squidclamav/files/digest-squidclamav-3.0 b/net-proxy/squidclamav/files/digest-squidclamav-3.0
deleted file mode 100644
index d4ef69021cf7..000000000000
--- a/net-proxy/squidclamav/files/digest-squidclamav-3.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1f45ae6208b82d19a56e34a7a3b56ea5 squidclamav-3.0.tar.gz 128954
-RMD160 7d24d0a3c722413a666a0a4ee82c3b1e3e2357b4 squidclamav-3.0.tar.gz 128954
-SHA256 190f62280bbef6a38da1cfcf16ba1158bb65a5be7e18221f83565ca701c3a3b6 squidclamav-3.0.tar.gz 128954
diff --git a/net-proxy/squidclamav/files/digest-squidclamav-3.2 b/net-proxy/squidclamav/files/digest-squidclamav-3.2
new file mode 100644
index 000000000000..ac05456cff80
--- /dev/null
+++ b/net-proxy/squidclamav/files/digest-squidclamav-3.2
@@ -0,0 +1,3 @@
+MD5 d137d304161c87498164a16eaf144c91 squidclamav-3.2.tar.gz 118542
+RMD160 c6d2de7cd9c43ca0fceb80ba13e01268ad3de301 squidclamav-3.2.tar.gz 118542
+SHA256 01c1077e9265d636c265f1f6ced8ca019e205325abff6b6737cb169b2e819143 squidclamav-3.2.tar.gz 118542
diff --git a/net-proxy/squidclamav/files/squidclamav-3.0-gentoo.patch b/net-proxy/squidclamav/files/squidclamav-3.0-gentoo.patch
deleted file mode 100644
index e345af62c3bc..000000000000
--- a/net-proxy/squidclamav/files/squidclamav-3.0-gentoo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nru squidclamav.orig/squidclamav.conf.dist squidclamav/squidclamav.conf.dist
---- squidclamav.orig/squidclamav.conf.dist	2006-08-28 11:55:15.000000000 +0300
-+++ squidclamav/squidclamav.conf.dist	2006-09-20 22:28:12.728508250 +0300
-@@ -36,12 +36,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-3.2-gentoo.patch b/net-proxy/squidclamav/files/squidclamav-3.2-gentoo.patch
new file mode 100644
index 000000000000..316aa00dfa39
--- /dev/null
+++ b/net-proxy/squidclamav/files/squidclamav-3.2-gentoo.patch
@@ -0,0 +1,28 @@
+diff -Nru squidclamav-3.2.orig/squidclamav.conf.dist squidclamav-3.2/squidclamav.conf.dist
+--- squidclamav-3.2.orig/squidclamav.conf.dist	2007-08-22 15:50:41.000000000 +0300
++++ squidclamav-3.2/squidclamav.conf.dist	2007-12-30 13:56:58.000000000 +0200
+@@ -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/squidclamav-3.0.ebuild b/net-proxy/squidclamav/squidclamav-3.2.ebuild
index eaf149cd74ce..f81ba3b253c2 100644
--- a/net-proxy/squidclamav/squidclamav-3.0.ebuild
+++ b/net-proxy/squidclamav/squidclamav-3.2.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-proxy/squidclamav/squidclamav-3.0.ebuild,v 1.3 2007/04/11 13:38:04 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/squidclamav/squidclamav-3.2.ebuild,v 1.1 2007/12/30 12:16:37 mrness Exp $
 
 inherit eutils
 
@@ -13,15 +13,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=net-misc/curl-7.12.1
+DEPEND="net-misc/curl
 	dev-libs/openssl
 	sys-libs/zlib
 	app-arch/bzip2"
 RDEPEND="${DEPEND}
 	net-proxy/squid"
 
-S="${WORKDIR}/${PN}"
-
 src_unpack() {
 	unpack ${A}
 
@@ -29,7 +27,7 @@ src_unpack() {
 }
 
 src_install() {
-	dosbin squidclamav
+	dosbin squidclamav || die "dosbin failed"
 	insinto /etc
 	newins squidclamav.conf.dist squidclamav.conf
 	keepdir /var/log/squidclamav