Remove clamav-0.90 patch (#167770)

Package-Manager: portage-2.1.2-r9

4 files changed, 19 insertions, 44 deletions

diff --git a/net-proxy/havp/ChangeLog b/net-proxy/havp/ChangeLog
index f6c9932cbd93..668cf50d4d13 100644
--- a/net-proxy/havp/ChangeLog
+++ b/net-proxy/havp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-proxy/havp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.13 2007/02/27 06:46:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/ChangeLog,v 1.14 2007/02/27 12:12:04 mrness Exp $
+
+  27 Feb 2007; Alin Nastac <mrness@gentoo.org>
+  -files/havp-0.84-clamav-0.90.patch, havp-0.84.ebuild:
+  Remove clamav-0.90 patch (#167770).
 
   27 Feb 2007; Christian Faulhammer <opfer@gentoo.org> havp-0.84.ebuild:
   stable x86; bug 167770
diff --git a/net-proxy/havp/Manifest b/net-proxy/havp/Manifest
index 8a2d931c6c44..84b9d08e4378 100644
--- a/net-proxy/havp/Manifest
+++ b/net-proxy/havp/Manifest
@@ -9,10 +9,6 @@ AUX havp-0.83-gentoo.patch 2048 RMD160 2cdc74be14d975f0844e5e85c9a5a292e00d18ac
 MD5 0739f5636de256e84c0ff1ded53e1ddb files/havp-0.83-gentoo.patch 2048
 RMD160 2cdc74be14d975f0844e5e85c9a5a292e00d18ac files/havp-0.83-gentoo.patch 2048
 SHA256 1a9a012d729cedc1ceff2dc20baee104b9a312a95d9a5bbc08d9bd887b1f5952 files/havp-0.83-gentoo.patch 2048
-AUX havp-0.84-clamav-0.90.patch 982 RMD160 4b0805d9e6b0cc95a8f551ba1ea0abe203798a7f SHA1 12eb97cb9483c5c502b362633d8519236338ef9c SHA256 9d237cb3bba79870577711205dd34a7d8a77bf3c72c45333ea82e7011cb7becf
-MD5 e2f4252df8102f5ca15391f6c94a5cbc files/havp-0.84-clamav-0.90.patch 982
-RMD160 4b0805d9e6b0cc95a8f551ba1ea0abe203798a7f files/havp-0.84-clamav-0.90.patch 982
-SHA256 9d237cb3bba79870577711205dd34a7d8a77bf3c72c45333ea82e7011cb7becf files/havp-0.84-clamav-0.90.patch 982
 AUX havp-0.84-gentoo.patch 1557 RMD160 40f8135388984214b397be5526d74561867eeb4c SHA1 ffbd64d75c5df724d40d0bedf73076ae6b1079e6 SHA256 517f8a2e3562f95bb8c66711f5b1eb322254818654127ee29a7d6a073cc9d625
 MD5 c423b398ca244672f9f11ab2349e1564 files/havp-0.84-gentoo.patch 1557
 RMD160 40f8135388984214b397be5526d74561867eeb4c files/havp-0.84-gentoo.patch 1557
@@ -32,14 +28,14 @@ EBUILD havp-0.83.ebuild 1539 RMD160 1e4b6fa933c163dd8192ab13fdebd075b0ccc756 SHA
 MD5 f61f0cfad5a2660c8ea76fcc5bf3fa26 havp-0.83.ebuild 1539
 RMD160 1e4b6fa933c163dd8192ab13fdebd075b0ccc756 havp-0.83.ebuild 1539
 SHA256 17b878fc8e443902ff5e2e8c4b18d9adf33ebeaa1252e62aaa6ca3e8f8d3dcc9 havp-0.83.ebuild 1539
-EBUILD havp-0.84.ebuild 1712 RMD160 5416a0a5f7af7448feccc45c142822d58a2355f1 SHA1 5f17c8ed6a4feb9d251a4bd8e8082ad3067fcab7 SHA256 4459c53526786fa8eb26a2c1e9fb1cdea94a46943fe0ffa4f493d14248dfbcff
-MD5 413888fcef058bcc1966582995d40df5 havp-0.84.ebuild 1712
-RMD160 5416a0a5f7af7448feccc45c142822d58a2355f1 havp-0.84.ebuild 1712
-SHA256 4459c53526786fa8eb26a2c1e9fb1cdea94a46943fe0ffa4f493d14248dfbcff havp-0.84.ebuild 1712
-MISC ChangeLog 2442 RMD160 e9963265d2ebc3a9dad54adda214ef6ef3afa2b5 SHA1 00a422e0bdbf832d6e5ae3352760484c56e7c265 SHA256 b369400d3d63061f558e62144f66a68bb130ea3b7873bf001587b8c8d5f872e6
-MD5 20d604b7c4b3c25f39565efedc013c68 ChangeLog 2442
-RMD160 e9963265d2ebc3a9dad54adda214ef6ef3afa2b5 ChangeLog 2442
-SHA256 b369400d3d63061f558e62144f66a68bb130ea3b7873bf001587b8c8d5f872e6 ChangeLog 2442
+EBUILD havp-0.84.ebuild 1591 RMD160 7b5cedfc185b58ce58025c11ec64dafc37a14083 SHA1 8743e9ab57d2e33ab31aafea7f51900a9eb10ae3 SHA256 67e1266f101c7ed7311665366ba012c0acebc60be02006cc4de06cd1a587b6ed
+MD5 13f8457cc8e5950bc815ab61d355208a havp-0.84.ebuild 1591
+RMD160 7b5cedfc185b58ce58025c11ec64dafc37a14083 havp-0.84.ebuild 1591
+SHA256 67e1266f101c7ed7311665366ba012c0acebc60be02006cc4de06cd1a587b6ed havp-0.84.ebuild 1591
+MISC ChangeLog 2585 RMD160 dfdc0efbe6c6f3db607efe31504ad1524c2bbbd3 SHA1 1e531d79e279385840d8ec67993f627c6277e755 SHA256 1f5519d710fd4f269f3f30ad77fb75cbdbc36a873de65d6cb2672c82233bf166
+MD5 3f5557dbeb7cc30d805e78b410ac4e57 ChangeLog 2585
+RMD160 dfdc0efbe6c6f3db607efe31504ad1524c2bbbd3 ChangeLog 2585
+SHA256 1f5519d710fd4f269f3f30ad77fb75cbdbc36a873de65d6cb2672c82233bf166 ChangeLog 2585
 MISC metadata.xml 309 RMD160 f9061c1bd03c07ffec2deb81e621912c5a4b091c SHA1 5c8174fcc33b5fe347de99a782d3535a3a90d1b9 SHA256 26c5dece4fe203c9ae4847405314a340fb86058060c9536a92dd7471f4f03d0d
 MD5 eeef2b4ba39eb40826f14b0bd0489563 metadata.xml 309
 RMD160 f9061c1bd03c07ffec2deb81e621912c5a4b091c metadata.xml 309
@@ -54,9 +50,9 @@ MD5 8c92f1c34f50e7838e3963a9d3ec00fe files/digest-havp-0.84 229
 RMD160 6de30cc8d8c9319f9cf6f476af7ab83701ed1a10 files/digest-havp-0.84 229
 SHA256 12b7c57494f191bf5a8ff82f4adc369d947e7e5df8d2c87c763602f727cd4a3a files/digest-havp-0.84 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF49OeNQqtfCuFneMRAqGDAJ91zkxvG4KzKnN6xPYvDPK7Y6MUcwCgkflp
-gvDE8rp1IYDjCj75aglNmzU=
-=GIxx
+iD8DBQFF5CBaJnxX6mF440QRApTBAJ0QiQLpNq+cl9l47BAIaQVwyStrCwCgs6yX
+sSdk436SF8vO1XWjXAh2jDU=
+=1nr3
 -----END PGP SIGNATURE-----
diff --git a/net-proxy/havp/files/havp-0.84-clamav-0.90.patch b/net-proxy/havp/files/havp-0.84-clamav-0.90.patch
deleted file mode 100644
index 21957f5d4882..000000000000
--- a/net-proxy/havp/files/havp-0.84-clamav-0.90.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nru havp-0.84.orig/havp/scanners/clamlibscanner.cpp havp-0.84/havp/scanners/clamlibscanner.cpp
---- havp-0.84.orig/havp/scanners/clamlibscanner.cpp        2007-02-20 17:39:33.202195475 +0100
-+++ havp-0.84/havp/scanners/clamlibscanner.cpp 2007-02-20 17:37:16.300080752 +0100
-@@ -29,7 +29,7 @@
- 
-     LogFile::ErrorMessage("ClamAV: Using database directory: %s\n", dbdir);
- 
--    if ( (ret = cl_loaddbdir(dbdir, &root, &no)) != 0 )
-+    if ( (ret = cl_load(dbdir, &root, &no, CL_DB_STDOPT)) != 0 )
-     {
-         LogFile::ErrorMessage("ClamAV: Could not load database: %s\n", cl_strerror(ret));
-         return false;
-@@ -65,7 +65,7 @@
- 
-         cl_settempdir(Params::GetConfigString("TEMPDIR").c_str(), 0);
- 
--        if ( (ret = cl_loaddbdir(dbdir, &root, &no)) != 0 )
-+        if ( (ret = cl_load(dbdir, &root, &no, CL_DB_STDOPT)) != 0 )
-         {
-             LogFile::ErrorMessage("ClamAV: Could not reload database: %s\n", cl_strerror(ret));
-             return false;
-
diff --git a/net-proxy/havp/havp-0.84.ebuild b/net-proxy/havp/havp-0.84.ebuild
index 7acc72028440..65a697372830 100644
--- a/net-proxy/havp/havp-0.84.ebuild
+++ b/net-proxy/havp/havp-0.84.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/havp/havp-0.84.ebuild,v 1.3 2007/02/27 06:46:40 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/havp/havp-0.84.ebuild,v 1.4 2007/02/27 12:12:04 mrness Exp $
 
 inherit eutils
 
@@ -24,9 +24,6 @@ src_unpack() {
 	unpack ${A}
 
 	epatch "${FILESDIR}/${P}-gentoo.patch"
-	if use clamav && has_version '>=app-antivirus/clamav-0.90' ; then
-		epatch "${FILESDIR}/${P}-clamav-0.90.patch"
-	fi
 }
 
 src_compile() {
@@ -53,7 +50,7 @@ src_install() {
 	diropts -m 0750
 	dodir /var/run/havp /var/tmp/havp
 
-	dodoc ChangeLog todo
+	dodoc ChangeLog
 }
 
 pkg_postinst() {