Fix compile thanks to jmbsvicetto in bug 169731

Package-Manager: portage-2.1.2-r12

23 files changed, 36 insertions, 417 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 98392f308c72..540d6adc7c78 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-antivirus/klamav
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.26 2007/03/06 22:33:43 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.27 2007/03/07 13:50:46 genstef Exp $
+
+  07 Mar 2007; <genstef@gentoo.org> -files/klamav-0.32-parallelmake.patch,
+  -files/klamav-0.35.1-gcc-4.1.patch,
+  -files/klamav-0.40-clamav_0.90_update.patch,
+  +files/klamav-0.41-cl_loaddbdir.patch, -klamav-0.17.3.ebuild,
+  -klamav-0.22.1.ebuild, -klamav-0.30.3.ebuild, -klamav-0.32.ebuild,
+  -klamav-0.35.ebuild, -klamav-0.35.1.ebuild, -klamav-0.37.ebuild,
+  -klamav-0.40.ebuild, klamav-0.41.ebuild:
+  Fix compile thanks to jmbsvicetto in bug 169731
 
 *klamav-0.41 (06 Mar 2007)
 
diff --git a/app-antivirus/klamav/Manifest b/app-antivirus/klamav/Manifest
index 18178607ac79..73f44a22a7b0 100644
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -1,110 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX klamav-0.32-parallelmake.patch 1187 RMD160 b2e3be531bf6d6675b5f5202a1076b472686f578 SHA1 c847f44bcf0bd7bc7d9e9531df51722472bd5c8d SHA256 0243e5e4e6bcdc748d8d18daaf92cfeb37f9e2544d64e7fd982f226552ed1b0f
-MD5 c56ae7218aa66579a77f03b7f4353166 files/klamav-0.32-parallelmake.patch 1187
-RMD160 b2e3be531bf6d6675b5f5202a1076b472686f578 files/klamav-0.32-parallelmake.patch 1187
-SHA256 0243e5e4e6bcdc748d8d18daaf92cfeb37f9e2544d64e7fd982f226552ed1b0f files/klamav-0.32-parallelmake.patch 1187
-AUX klamav-0.35.1-gcc-4.1.patch 790 RMD160 1f01232a80ea51054e2383be34a7b99de0c11d2d SHA1 845f8a4931e9d349a9b11bfaa6c58bffd09dd859 SHA256 c80272257b44cb04447c3c69fe65f4fa5f6c4af3099eee81764fc0ce86e798c2
-MD5 1eb52be876dee42f10838752b531c120 files/klamav-0.35.1-gcc-4.1.patch 790
-RMD160 1f01232a80ea51054e2383be34a7b99de0c11d2d files/klamav-0.35.1-gcc-4.1.patch 790
-SHA256 c80272257b44cb04447c3c69fe65f4fa5f6c4af3099eee81764fc0ce86e798c2 files/klamav-0.35.1-gcc-4.1.patch 790
-AUX klamav-0.40-clamav_0.90_update.patch 1743 RMD160 2bbc7641e3af549d3654704c4b84be86621e1f6f SHA1 678f292555a0e04b3164e0ba266820914d342ce9 SHA256 dc35df93bbf33ac11ef66aace19e74a5fa2a3b98697a89e8fe7b7db0be3072a3
-MD5 424ee1590bdb850b976bff8fb7a83017 files/klamav-0.40-clamav_0.90_update.patch 1743
-RMD160 2bbc7641e3af549d3654704c4b84be86621e1f6f files/klamav-0.40-clamav_0.90_update.patch 1743
-SHA256 dc35df93bbf33ac11ef66aace19e74a5fa2a3b98697a89e8fe7b7db0be3072a3 files/klamav-0.40-clamav_0.90_update.patch 1743
-DIST klamav-0.17.3.tar.bz2 646829 RMD160 9b5be7dbd16a27c26352b2ced16ce72dec184aba SHA1 c24513a12a3f82bf6f49e437a3bb686ec8bb3d8f SHA256 fb0a9b020e596d671cba815067e7268b4448f1771a672fc335e760a8b378caa3
-DIST klamav-0.22.1.tar.bz2 805460 RMD160 476ed559829474eba154bb5b2fdfbc8882c0136a SHA1 2abeaecc61f7e90310e27f7ec134dbb68db86105 SHA256 dd38251f0ca71d352026ed99f7cbc56cd6a4d7d069f87a8d9bd4c7c3a5d2854b
-DIST klamav-0.30.3-source.tar.gz 1406338 RMD160 630231a1d00ce1758e7056ce9af861ef5f19d582 SHA1 b212fcc9ab1ee6b4b93f7dfe8d40dad4e6a5bd8f SHA256 e4d93b9a7b8e711125a1fba0fbbdb42b4509ba0970a4d78b593ac76830008ebc
-DIST klamav-0.32-source.tar.gz 1157542 RMD160 bc654898f03ea180297e563a370405ca88f8a6e1 SHA1 15a2d9afe41b57136e2a2ce36ba6fd314200647f SHA256 69db2da5ddf2dd0a6892088c556eeaffdb1410e08f789633e1c65271839f23de
-DIST klamav-0.35-source.tar.gz 1711833 RMD160 9824d7bfa94899e43ddf49275fd0b984d9f87cb8 SHA1 9e7aa9d43a9191501d155b5787b0352813061db1 SHA256 448daebb7d258f2a7d703d58b2fcf5ed07fd08516e372698b3c358a74c7e0ec8
-DIST klamav-0.35.1-source.tar.gz 1619223 RMD160 58788d4fdac354fbce14eaff4937bb705624ec71 SHA1 6d8c2a44fd1962381a8af09aed5b86143daaeb6a SHA256 e0cad5870bc6393460c5408795cb836e4a18b6ab1f663a0a24ffeb5cec571d07
-DIST klamav-0.37-source.tar.gz 1697192 RMD160 7603dccec96f18b5dd803e3125b645356825d966 SHA1 b13289b865334fd8c14903d27abf63659dd04ee8 SHA256 e038785a91775f1b6b2e3b3ddb6d4ebae4ccaf0efe34248df68ca179358b581e
+AUX klamav-0.41-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
+MD5 21c89a75c8ae9006658c2bf582797393 files/klamav-0.41-cl_loaddbdir.patch 653
+RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 files/klamav-0.41-cl_loaddbdir.patch 653
+SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd files/klamav-0.41-cl_loaddbdir.patch 653
 DIST klamav-0.38-source.tar.gz 2050525 RMD160 6b618f3922932a41f5824400954f3ecc4b192ab1 SHA1 f02b98dcda30a82781767143195d4bc1ad7af60b SHA256 76c172ee8e10c9a2dee02b4d32c4acbfa1eaa5e1fdf6e74d7b51802de344e7f9
-DIST klamav-0.40-source.tar.gz 1758899 RMD160 98ed93097d095c6bd3b6be20f144fd51638471d5 SHA1 1278f2b4e7870f99943e7df9b66049e0956cbe70 SHA256 add8b6093aaf97ef2cb89c17c135ed8aecd7c4e4055ec2a6d79d8344c9b78fee
 DIST klamav-0.41-source.tar.gz 1783244 RMD160 84c8b57fc8391624ec288b6b5fe0497a92e97baf SHA1 cf8d9d9f008057ab66b36e497cda375c95cba7f3 SHA256 7419db65041097129929064f065ae623e8e04a67a550ef24dff3d20223802340
-EBUILD klamav-0.17.3.ebuild 493 RMD160 0ef257851ac40bb2e35b93bc01c0c4c1aae4c33a SHA1 faffc2fa6c3337661174c45ed05d3c5014df8b70 SHA256 2e706c799c973e8a888d914c185a8215d3dd1308bc520a2206f03f5eb069ce51
-MD5 663ae694ff0c2c6d89b70af1005ce731 klamav-0.17.3.ebuild 493
-RMD160 0ef257851ac40bb2e35b93bc01c0c4c1aae4c33a klamav-0.17.3.ebuild 493
-SHA256 2e706c799c973e8a888d914c185a8215d3dd1308bc520a2206f03f5eb069ce51 klamav-0.17.3.ebuild 493
-EBUILD klamav-0.22.1.ebuild 494 RMD160 01e6b492d2839246f7f90d5028e2bd2ada1aefd4 SHA1 da1d3ec23af54defc32438d4f279bbef5dbd69e5 SHA256 537aa1f08b6679999e7b2b03546cedb81576f9f62afc4a8442c28b2493eee61d
-MD5 016c7c8f4c86f116407a7950d9cf21cc klamav-0.22.1.ebuild 494
-RMD160 01e6b492d2839246f7f90d5028e2bd2ada1aefd4 klamav-0.22.1.ebuild 494
-SHA256 537aa1f08b6679999e7b2b03546cedb81576f9f62afc4a8442c28b2493eee61d klamav-0.22.1.ebuild 494
-EBUILD klamav-0.30.3.ebuild 541 RMD160 5918bb7a4c9a4f17546a1b6c0db6e77624733d0b SHA1 f387ff5a84bea913241c4523f91b1447fa5b93bc SHA256 6846309387894d914fc7e3c997c9342e703063430e4f143f6401b0f358dcbce2
-MD5 1d437e09b9859aa86ae234eae86a40c3 klamav-0.30.3.ebuild 541
-RMD160 5918bb7a4c9a4f17546a1b6c0db6e77624733d0b klamav-0.30.3.ebuild 541
-SHA256 6846309387894d914fc7e3c997c9342e703063430e4f143f6401b0f358dcbce2 klamav-0.30.3.ebuild 541
-EBUILD klamav-0.32.ebuild 649 RMD160 e53a5258665261f41a64edb333166acb526f626f SHA1 8c45e8e89ea07eecb64624f83419b2960120fb44 SHA256 def355ffc3d75e388d27c499ec164c2fcac810e805b311c5c29331d3c90f5763
-MD5 e4eb6eda210f1a4e9bd6ff6f9bda9434 klamav-0.32.ebuild 649
-RMD160 e53a5258665261f41a64edb333166acb526f626f klamav-0.32.ebuild 649
-SHA256 def355ffc3d75e388d27c499ec164c2fcac810e805b311c5c29331d3c90f5763 klamav-0.32.ebuild 649
-EBUILD klamav-0.35.1.ebuild 615 RMD160 32c8293ff585ed2e4e34cbb05f77338b8c263572 SHA1 3153475bc815d50b25bbd18fafa9b69710c51bc9 SHA256 45f3f9748c2439f902a19c76e9050a002be0659d873d2546dae9869332f32813
-MD5 4dbe1bc1d148bee4ec4d8f088233d8f0 klamav-0.35.1.ebuild 615
-RMD160 32c8293ff585ed2e4e34cbb05f77338b8c263572 klamav-0.35.1.ebuild 615
-SHA256 45f3f9748c2439f902a19c76e9050a002be0659d873d2546dae9869332f32813 klamav-0.35.1.ebuild 615
-EBUILD klamav-0.35.ebuild 728 RMD160 7573ee066abd7956df52edd4726c2e3131e1310f SHA1 9477f3919abc9c316a120821abaf2e124bdbdcb5 SHA256 b114bcadf41ad3163e808083c843a0bc07e1563c99010239ccf8f3fd85a940a0
-MD5 6d996d6a6415f567ba13882688fd9efc klamav-0.35.ebuild 728
-RMD160 7573ee066abd7956df52edd4726c2e3131e1310f klamav-0.35.ebuild 728
-SHA256 b114bcadf41ad3163e808083c843a0bc07e1563c99010239ccf8f3fd85a940a0 klamav-0.35.ebuild 728
-EBUILD klamav-0.37.ebuild 573 RMD160 e1bcb22a82fd8d52778ecb0b9cf0c3f488235030 SHA1 680399aa83f042da17a9dfc277478adc770190f4 SHA256 9f57afbb8a1d8e637aaa2e0e059a5eb6c48b9b1da8853cf55f701182af0101ad
-MD5 ea8480b2e5db15e504cab43597be72fd klamav-0.37.ebuild 573
-RMD160 e1bcb22a82fd8d52778ecb0b9cf0c3f488235030 klamav-0.37.ebuild 573
-SHA256 9f57afbb8a1d8e637aaa2e0e059a5eb6c48b9b1da8853cf55f701182af0101ad klamav-0.37.ebuild 573
 EBUILD klamav-0.38.ebuild 886 RMD160 56e6a43bb6c84ab802a6becc46152b46327c5fea SHA1 5e62e3ab588f63802da6627d78d4990f5cdc1a2a SHA256 8faa54eb2bb09db7cdb4d2f7183d64f3e3d74c522aa4c5f4b426265435754926
 MD5 d6ee116f7c654ac2e691c4aa5c120357 klamav-0.38.ebuild 886
 RMD160 56e6a43bb6c84ab802a6becc46152b46327c5fea klamav-0.38.ebuild 886
 SHA256 8faa54eb2bb09db7cdb4d2f7183d64f3e3d74c522aa4c5f4b426265435754926 klamav-0.38.ebuild 886
-EBUILD klamav-0.40.ebuild 941 RMD160 f2e879ed4d37d968df4afc30aefbd4ddc91307da SHA1 7b73332858683be815cde81436d4f1c52e4e7c33 SHA256 8ca0d4004c6ea241737d6397635255fdc212f542dac0d32ad54e04f4e33f6368
-MD5 d0f3642a539b059683a1328f706784c5 klamav-0.40.ebuild 941
-RMD160 f2e879ed4d37d968df4afc30aefbd4ddc91307da klamav-0.40.ebuild 941
-SHA256 8ca0d4004c6ea241737d6397635255fdc212f542dac0d32ad54e04f4e33f6368 klamav-0.40.ebuild 941
-EBUILD klamav-0.41.ebuild 888 RMD160 8addedd49364953ecbdd40728c0bc260a388c642 SHA1 1efd3374ec5f2ee596cdb18ac3bfb3547d349316 SHA256 2bfcc54ad8221e5a67993cfd32d224622bfa95b10eb279864c8f589379ed1600
-MD5 4b65df8e01de2d864a7b590cf5c21da4 klamav-0.41.ebuild 888
-RMD160 8addedd49364953ecbdd40728c0bc260a388c642 klamav-0.41.ebuild 888
-SHA256 2bfcc54ad8221e5a67993cfd32d224622bfa95b10eb279864c8f589379ed1600 klamav-0.41.ebuild 888
-MISC ChangeLog 3596 RMD160 8d804aa80611c30809763a6e399690a77a71871f SHA1 9b373cfabe39a031af2b156824e246f4082c96cd SHA256 81fa88072e6a1f068bce260dfaa9d278789a774e4c1eac5eb0085e7810cb349a
-MD5 6da52a34eabe808b4b3f0b9d4e2da4e4 ChangeLog 3596
-RMD160 8d804aa80611c30809763a6e399690a77a71871f ChangeLog 3596
-SHA256 81fa88072e6a1f068bce260dfaa9d278789a774e4c1eac5eb0085e7810cb349a ChangeLog 3596
+EBUILD klamav-0.41.ebuild 937 RMD160 098a84f1577cd1d2d032c4e8434a4d6d1b42c893 SHA1 4de772ad31a95cd6d3767fdc55f580ddd304df17 SHA256 e529a7f6b40e9a2c651cf341cfae71e62ef95cd3987cc381494dce62cd4b020a
+MD5 664927efa4ae1a4f1dd78302e2327098 klamav-0.41.ebuild 937
+RMD160 098a84f1577cd1d2d032c4e8434a4d6d1b42c893 klamav-0.41.ebuild 937
+SHA256 e529a7f6b40e9a2c651cf341cfae71e62ef95cd3987cc381494dce62cd4b020a klamav-0.41.ebuild 937
+MISC ChangeLog 4052 RMD160 73feb38a91fc5472f0e01f0e6de1ca2f6bf6ce35 SHA1 d6a9812c610d3cf6401ec6da184711abf1ad796c SHA256 d68807bfe4d425bca38f07bae4c7225adcfaf17ac6a2762df6a63efbdea073a2
+MD5 239adf43c9cb2b1025017d385d4f2aa5 ChangeLog 4052
+RMD160 73feb38a91fc5472f0e01f0e6de1ca2f6bf6ce35 ChangeLog 4052
+SHA256 d68807bfe4d425bca38f07bae4c7225adcfaf17ac6a2762df6a63efbdea073a2 ChangeLog 4052
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
-MD5 05418e4762e6978f2b5138c304e5d4bf files/digest-klamav-0.17.3 244
-RMD160 d270520e6329bc0fb4640b211368518d20fd25ce files/digest-klamav-0.17.3 244
-SHA256 8970634eeea0468274112dd440ad2c36372f65aeec73d27d3afad79f14f3cac7 files/digest-klamav-0.17.3 244
-MD5 326f080e1560b4ba7d9a8d13f09b52e5 files/digest-klamav-0.22.1 244
-RMD160 1ece5546f6e2ae34c440de7c6d118eca17c3708d files/digest-klamav-0.22.1 244
-SHA256 e31d9f80c720284dbfd328011e81e115476a17b7787b9af518860b59c98a4bb7 files/digest-klamav-0.22.1 244
-MD5 0329246a03671b4c1dcdf4ddb00620eb files/digest-klamav-0.30.3 265
-RMD160 ffc72466a1eaf18bb5922ec397fb62d3ef2b32c6 files/digest-klamav-0.30.3 265
-SHA256 a88d599bd7d30a4203d9d762ca33e0ca0d5efc2c9c9301846534811c3945a2a4 files/digest-klamav-0.30.3 265
-MD5 1856d7736679c8db476d6bab5b4f48b6 files/digest-klamav-0.32 259
-RMD160 37425c2583e24ffd627dd122c7b1e1f097a53a92 files/digest-klamav-0.32 259
-SHA256 25d503e64174f5efecf27d52976631a93a3dffc30fde76644ac7b57ffc73176e files/digest-klamav-0.32 259
-MD5 023d210ebe32acd46ccfee7a52e3a19a files/digest-klamav-0.35 259
-RMD160 07310bef54cdeacda7df6819cec2eecb619ab38b files/digest-klamav-0.35 259
-SHA256 0a4d98d27003ee9933b2906fbb2a9d76b7f6d65ed147f0505aa07a8e851baf07 files/digest-klamav-0.35 259
-MD5 88a01a337b074c00f8b6dad798612385 files/digest-klamav-0.35.1 265
-RMD160 bf17eff1ed33cd4db715f551e923145f5d4830dd files/digest-klamav-0.35.1 265
-SHA256 0e818105a36b91fa9e66d1b6d3ed1cfcae3d874c2e0d09a8452c1ce1b3c57bdb files/digest-klamav-0.35.1 265
-MD5 265cbd1aaff3bff78fd7fd255ab12a6a files/digest-klamav-0.37 259
-RMD160 edbdc8a5173c8e9c5a5c9dbd6f3ec2cc6e08b2e5 files/digest-klamav-0.37 259
-SHA256 2c0e929a73448fbde4944842452072738da6bacd06fc07d6e7146f79f3fb7a62 files/digest-klamav-0.37 259
 MD5 c2327e92424d115a2c3721aecf156b41 files/digest-klamav-0.38 259
 RMD160 5250a8d2ab6de60fd38ff00463b3207ff3e495ff files/digest-klamav-0.38 259
 SHA256 e55e6dacc6c4cf1783c2b50e66ddbf4f62a2ffe595f9913a932d95a1606182dd files/digest-klamav-0.38 259
-MD5 aed8e2649f40556d71f331eb2dd0d56b files/digest-klamav-0.40 259
-RMD160 e37a21c943c3fdc71f5b326daa9aaa419e8e3407 files/digest-klamav-0.40 259
-SHA256 06abc567af8674df301b61c678350f69d90dd93c4a1ef0851606f977cb327e9c files/digest-klamav-0.40 259
 MD5 b00478fa75f506c088598408c980e599 files/digest-klamav-0.41 259
 RMD160 e30523cc4b47e0cd7e5fa425d3931872f5c71755 files/digest-klamav-0.41 259
 SHA256 f46d90d65169f980763655fa2048c1d2f184b8df15b81f7ef37a0f3acfd2b516 files/digest-klamav-0.41 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF7e9RexDpKttj3ykRAsc0AJ9S3NE+vfDc7XaWsQ8r0V1wFVLlOgCbBbE3
-AJfEwNUe7PzPiMGFKiQJ0mk=
-=sXMK
------END PGP SIGNATURE-----
diff --git a/app-antivirus/klamav/files/digest-klamav-0.17.3 b/app-antivirus/klamav/files/digest-klamav-0.17.3
deleted file mode 100644
index 530f3e5dd0ca..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.17.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 32b581d2f6aec22e7a92261e35389345 klamav-0.17.3.tar.bz2 646829
-RMD160 9b5be7dbd16a27c26352b2ced16ce72dec184aba klamav-0.17.3.tar.bz2 646829
-SHA256 fb0a9b020e596d671cba815067e7268b4448f1771a672fc335e760a8b378caa3 klamav-0.17.3.tar.bz2 646829
diff --git a/app-antivirus/klamav/files/digest-klamav-0.22.1 b/app-antivirus/klamav/files/digest-klamav-0.22.1
deleted file mode 100644
index fa7d9d152b63..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.22.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 13f6f63c3adcb661eab64c50ffca74a7 klamav-0.22.1.tar.bz2 805460
-RMD160 476ed559829474eba154bb5b2fdfbc8882c0136a klamav-0.22.1.tar.bz2 805460
-SHA256 dd38251f0ca71d352026ed99f7cbc56cd6a4d7d069f87a8d9bd4c7c3a5d2854b klamav-0.22.1.tar.bz2 805460
diff --git a/app-antivirus/klamav/files/digest-klamav-0.30.3 b/app-antivirus/klamav/files/digest-klamav-0.30.3
deleted file mode 100644
index 14b2df682e4e..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.30.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b50966be3da1d3261b5706fdf71773c1 klamav-0.30.3-source.tar.gz 1406338
-RMD160 630231a1d00ce1758e7056ce9af861ef5f19d582 klamav-0.30.3-source.tar.gz 1406338
-SHA256 e4d93b9a7b8e711125a1fba0fbbdb42b4509ba0970a4d78b593ac76830008ebc klamav-0.30.3-source.tar.gz 1406338
diff --git a/app-antivirus/klamav/files/digest-klamav-0.32 b/app-antivirus/klamav/files/digest-klamav-0.32
deleted file mode 100644
index 365aff5dec5f..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.32
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9adbf24e99af3fa4e326923f9b143252 klamav-0.32-source.tar.gz 1157542
-RMD160 bc654898f03ea180297e563a370405ca88f8a6e1 klamav-0.32-source.tar.gz 1157542
-SHA256 69db2da5ddf2dd0a6892088c556eeaffdb1410e08f789633e1c65271839f23de klamav-0.32-source.tar.gz 1157542
diff --git a/app-antivirus/klamav/files/digest-klamav-0.35 b/app-antivirus/klamav/files/digest-klamav-0.35
deleted file mode 100644
index 94f95ada0147..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.35
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 50dd8abeeb566f93898e0c75514a9a5a klamav-0.35-source.tar.gz 1711833
-RMD160 9824d7bfa94899e43ddf49275fd0b984d9f87cb8 klamav-0.35-source.tar.gz 1711833
-SHA256 448daebb7d258f2a7d703d58b2fcf5ed07fd08516e372698b3c358a74c7e0ec8 klamav-0.35-source.tar.gz 1711833
diff --git a/app-antivirus/klamav/files/digest-klamav-0.35.1 b/app-antivirus/klamav/files/digest-klamav-0.35.1
deleted file mode 100644
index 7b62159f3a13..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.35.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 015c964b4d2f71dd5b70e859914f3d3b klamav-0.35.1-source.tar.gz 1619223
-RMD160 58788d4fdac354fbce14eaff4937bb705624ec71 klamav-0.35.1-source.tar.gz 1619223
-SHA256 e0cad5870bc6393460c5408795cb836e4a18b6ab1f663a0a24ffeb5cec571d07 klamav-0.35.1-source.tar.gz 1619223
diff --git a/app-antivirus/klamav/files/digest-klamav-0.37 b/app-antivirus/klamav/files/digest-klamav-0.37
deleted file mode 100644
index 5491ee03a045..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.37
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b6ab88bc9da7c5166cacd7cd74364243 klamav-0.37-source.tar.gz 1697192
-RMD160 7603dccec96f18b5dd803e3125b645356825d966 klamav-0.37-source.tar.gz 1697192
-SHA256 e038785a91775f1b6b2e3b3ddb6d4ebae4ccaf0efe34248df68ca179358b581e klamav-0.37-source.tar.gz 1697192
diff --git a/app-antivirus/klamav/files/digest-klamav-0.40 b/app-antivirus/klamav/files/digest-klamav-0.40
deleted file mode 100644
index 2ca12e94e1a4..000000000000
--- a/app-antivirus/klamav/files/digest-klamav-0.40
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 65818ece1115848602c87ab878784fea klamav-0.40-source.tar.gz 1758899
-RMD160 98ed93097d095c6bd3b6be20f144fd51638471d5 klamav-0.40-source.tar.gz 1758899
-SHA256 add8b6093aaf97ef2cb89c17c135ed8aecd7c4e4055ec2a6d79d8344c9b78fee klamav-0.40-source.tar.gz 1758899
diff --git a/app-antivirus/klamav/files/klamav-0.32-parallelmake.patch b/app-antivirus/klamav/files/klamav-0.32-parallelmake.patch
deleted file mode 100644
index 4c42556b8f38..000000000000
--- a/app-antivirus/klamav/files/klamav-0.32-parallelmake.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: klamav-0.32-source/klamav-0.32/src/arkollon/uninstallwizard.cpp
-===================================================================
---- klamav-0.32-source.orig/klamav-0.32/src/arkollon/uninstallwizard.cpp
-+++ klamav-0.32-source/klamav-0.32/src/arkollon/uninstallwizard.cpp
-@@ -318,5 +318,5 @@ void UninstallWizard::finished()
- 	nextButton->setEnabled(true);
- }
- 
--
-+#include "uninstallwizard.moc"
- 
-Index: klamav-0.32-source/klamav-0.32/src/arkollon/wizard.cpp
-===================================================================
---- klamav-0.32-source.orig/klamav-0.32/src/arkollon/wizard.cpp
-+++ klamav-0.32-source/klamav-0.32/src/arkollon/wizard.cpp
-@@ -913,5 +913,5 @@ void Wizard::logPressed()
- 	logDialog->show();
- }
- 
--
-+#include "wizard.moc"
- 
-Index: klamav-0.32-source/klamav-0.32/Makefile.am
-===================================================================
---- klamav-0.32-source.orig/klamav-0.32/Makefile.am
-+++ klamav-0.32-source/klamav-0.32/Makefile.am
-@@ -20,4 +20,3 @@ EXTRA_DIST = admin COPYING configure.in.
- dist-hook:
- 	cd $(top_distdir) && perl admin/am_edit -padmin
- 	cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
--_SOURCES = dcopklamscan.h
diff --git a/app-antivirus/klamav/files/klamav-0.35.1-gcc-4.1.patch b/app-antivirus/klamav/files/klamav-0.35.1-gcc-4.1.patch
deleted file mode 100644
index 51c330a97a88..000000000000
--- a/app-antivirus/klamav/files/klamav-0.35.1-gcc-4.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- klamav-0.35.1/src/dbviewer.h.orig	2006-02-08 23:58:12.000000000 +0100
-+++ klamav-0.35.1/src/dbviewer.h	2006-04-20 13:02:29.000000000 +0200
-@@ -62,7 +62,7 @@
- 	int listdir(const char *dirname);
- 	int checkdir(const char *dirname);
- 	int listdb(const char *filename);
--	unsigned int  KlamDB::getSigNos();
-+	unsigned int  getSigNos();
- 	KProgress* prog;
- 	KProgressDialog* progress;
- 	void addVirusName(char * start);
---- klamav-0.35.1/src/freshklam.h.orig	2006-02-08 23:58:12.000000000 +0100
-+++ klamav-0.35.1/src/freshklam.h	2006-04-20 13:03:26.000000000 +0200
-@@ -70,7 +70,7 @@
-     QString  getCurrentDBDir();
-     bool isFreshklamAlive();
-     QPushButton *search_button, *cancel_button;
--    void Freshklam::enableAutoUpdates();
-+    void enableAutoUpdates();
- 
- protected:
-     /**
diff --git a/app-antivirus/klamav/files/klamav-0.40-clamav_0.90_update.patch b/app-antivirus/klamav/files/klamav-0.40-clamav_0.90_update.patch
deleted file mode 100644
index 6261c74c55d7..000000000000
--- a/app-antivirus/klamav/files/klamav-0.40-clamav_0.90_update.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Naur klamav-0.40-source-orig/klamav-0.40/src/freshklam.cpp klamav-0.40-source/klamav-0.40/src/freshklam.cpp
---- klamav-0.40-source-orig/klamav-0.40/src/freshklam.cpp	2007-01-02 20:46:37.000000000 +0100
-+++ klamav-0.40-source/klamav-0.40/src/freshklam.cpp	2007-02-20 00:09:04.000000000 +0100
-@@ -835,7 +835,9 @@
-     
- 
-     if (dbdir != dir_combo->url()){
--        ret = cl_loaddbdir((const char *)dir_combo->url(), &root, &no);
-+        //ret = cl_loaddbdir((const char *)dir_combo->url(), &root, &no);
-+	 // clamav 0.90 update
-+        ret = cl_load((const char *)dir_combo->url(), &root, &no, CL_DB_STDOPT);
-         ////kdDebug() << "ret " << ret << endl;
-         if (no == 0){
-             db = dbdir;
-diff -Naur klamav-0.40-source-orig/klamav-0.40/src/klamav.cpp klamav-0.40-source/klamav-0.40/src/klamav.cpp
---- klamav-0.40-source-orig/klamav-0.40/src/klamav.cpp	2007-01-02 20:46:37.000000000 +0100
-+++ klamav-0.40-source/klamav-0.40/src/klamav.cpp	2007-02-20 00:06:02.000000000 +0100
-@@ -184,6 +184,8 @@
- 	hide();
- 	//return false;
- 
-+	// no default ret value
-+	return true;
- }
- 
- 
-diff -Naur klamav-0.40-source-orig/klamav-0.40/src/dbviewer.cpp klamav-0.40-source/klamav-0.40/src/dbviewer.cpp
---- klamav-0.40-source-orig/klamav-0.40/src/dbviewer.cpp	2007-01-02 20:46:37.000000000 +0100
-+++ klamav-0.40-source/klamav-0.40/src/dbviewer.cpp	2007-02-20 00:20:02.000000000 +0100
-@@ -815,7 +815,9 @@
-     dbdir = lastDownloadPaths.first();
- 
- 
--    ret = cl_loaddbdir((const char *)dbdir, &root, &no);
-+    //ret = cl_loaddbdir((const char *)dbdir, &root, &no);
-+    // clamav-0.90 update
-+    ret = cl_load((const char *)dbdir, &root, &no, CL_DB_STDOPT);
-     //kdDebug() << "no " << no << endl;
-     cl_free(root);
-     return no;
diff --git a/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch b/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch
new file mode 100644
index 000000000000..202d942b1aff
--- /dev/null
+++ b/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch
@@ -0,0 +1,11 @@
+--- klamav-0.41/src/klammail/clamdmail.c.orig	2007-03-07 11:51:17.000000000 -0100
++++ klamav-0.41/src/klammail/clamdmail.c	2007-03-07 11:50:08.000000000 -0100
+@@ -185,7 +185,7 @@
+                                     return 50;
+                                 }
+                         }else{
+-                                if((ret = cl_loaddbdir(cl_retdbdir(), &engine, &no, CL_DB_STDOPT))) {
++                                if((ret = cl_loaddbdir(cl_retdbdir(), &engine, &no))) {
+                                 printf("cl_loaddbdir: %s\n", cl_strerror(ret));
+                                 close(fd);
+                                 exit(2);
diff --git a/app-antivirus/klamav/klamav-0.17.3.ebuild b/app-antivirus/klamav/klamav-0.17.3.ebuild
deleted file mode 100644
index ea6b67d13575..000000000000
--- a/app-antivirus/klamav/klamav-0.17.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.17.3.ebuild,v 1.2 2005/07/22 10:00:58 dholm Exp $
-
-inherit kde
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3
diff --git a/app-antivirus/klamav/klamav-0.22.1.ebuild b/app-antivirus/klamav/klamav-0.22.1.ebuild
deleted file mode 100644
index aa71517e9c2e..000000000000
--- a/app-antivirus/klamav/klamav-0.22.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.22.1.ebuild,v 1.1 2005/08/05 11:25:48 greg_g Exp $
-
-inherit kde
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3
diff --git a/app-antivirus/klamav/klamav-0.30.3.ebuild b/app-antivirus/klamav/klamav-0.30.3.ebuild
deleted file mode 100644
index 79dcd7077bd7..000000000000
--- a/app-antivirus/klamav/klamav-0.30.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.30.3.ebuild,v 1.3 2006/03/12 03:10:41 weeve Exp $
-
-inherit kde
-
-MY_P="${P}-source"
-S="${WORKDIR}/${MY_P}/${P}"
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3
diff --git a/app-antivirus/klamav/klamav-0.32.ebuild b/app-antivirus/klamav/klamav-0.32.ebuild
deleted file mode 100644
index 15289f4c2281..000000000000
--- a/app-antivirus/klamav/klamav-0.32.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.32.ebuild,v 1.2 2006/01/10 00:07:45 flameeyes Exp $
-
-inherit kde
-
-MY_P="${P}-source"
-S="${WORKDIR}/${MY_P}/${P}"
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3
-
-src_unpack() {
-	kde_src_unpack
-
-	epatch "${FILESDIR}/${P}-parallelmake.patch"
-	rm -f ${S}/configure
-}
-
diff --git a/app-antivirus/klamav/klamav-0.35.1.ebuild b/app-antivirus/klamav/klamav-0.35.1.ebuild
deleted file mode 100644
index 098280da6ea6..000000000000
--- a/app-antivirus/klamav/klamav-0.35.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.35.1.ebuild,v 1.5 2007/03/06 22:33:43 troll Exp $
-
-inherit kde eutils flag-o-matic
-
-MY_P="${P}-source"
-S="${WORKDIR}/${MY_P}/${P}"
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/klamav/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3.4
-
-PATCHES="${FILESDIR}/klamav-0.35.1-gcc-4.1.patch"
diff --git a/app-antivirus/klamav/klamav-0.35.ebuild b/app-antivirus/klamav/klamav-0.35.ebuild
deleted file mode 100644
index 538ffe3ed57b..000000000000
--- a/app-antivirus/klamav/klamav-0.35.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.35.ebuild,v 1.1 2006/02/04 10:51:54 centic Exp $
-
-inherit kde eutils flag-o-matic
-
-MY_P="${P}-source"
-S="${WORKDIR}/${MY_P}/${P}"
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3
-
-#src_unpack() {
-#	kde_src_unpack
-#
-#	rm -f ${S}/configure
-#}
-
-#src_compile() {
-#	PREFIX="${KDEDIR}"
-#
-#	kde_src_compile
-#}
-
-#src_install() {
-#	kde_src_install
-#
-#}
-
diff --git a/app-antivirus/klamav/klamav-0.37.ebuild b/app-antivirus/klamav/klamav-0.37.ebuild
deleted file mode 100644
index 7389e69b80dd..000000000000
--- a/app-antivirus/klamav/klamav-0.37.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.37.ebuild,v 1.2 2006/08/15 09:05:14 corsair Exp $
-
-inherit kde eutils flag-o-matic
-
-MY_P="${P}-source"
-S="${WORKDIR}/${MY_P}/${P}"
-
-DESCRIPTION="KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/klamav/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="app-antivirus/clamav"
-
-need-kde 3.4
diff --git a/app-antivirus/klamav/klamav-0.40.ebuild b/app-antivirus/klamav/klamav-0.40.ebuild
deleted file mode 100644
index 19f6d14ddecb..000000000000
--- a/app-antivirus/klamav/klamav-0.40.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.40.ebuild,v 1.2 2007/03/06 22:33:43 troll Exp $
-
-inherit kde
-
-MY_P="${P}-source"
-S="${WORKDIR}/${MY_P}/${P}"
-
-DESCRIPTION="KlamAV is a KDE frontend for the ClamAV antivirus."
-HOMEPAGE="http://klamav.sourceforge.net/"
-SRC_URI="mirror://sourceforge/klamav/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=app-antivirus/clamav-0.90"
-RDEPEND="${DEPEND}"
-
-need-kde 3.4
-
-PATCHES="${FILESDIR}/${P}-clamav_0.90_update.patch"
-
-src_unpack(){
-	kde_src_unpack
-	# Assure a future version won't try to build this.
-	rm -rf ${WORKDIR}/${MY_P}/dazuko* || die "We missed to eradicate some files"
-}
-
-pkg_postinst(){
-	elog "The on-access scanning functionality is provided by"
-	elog "the Dazuko kernel module:  emerge sys-fs/dazuko"
-}
diff --git a/app-antivirus/klamav/klamav-0.41.ebuild b/app-antivirus/klamav/klamav-0.41.ebuild
index 4bf9eaba8292..14b1bc582de4 100644
--- a/app-antivirus/klamav/klamav-0.41.ebuild
+++ b/app-antivirus/klamav/klamav-0.41.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/app-antivirus/klamav/klamav-0.41.ebuild,v 1.1 2007/03/06 22:33:43 troll Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.41.ebuild,v 1.2 2007/03/07 13:50:46 genstef Exp $
 
 inherit kde
 
@@ -21,6 +21,8 @@ RDEPEND="${DEPEND}"
 
 need-kde 3.4
 
+PATCHES="${FILESDIR}/${P}-cl_loaddbdir.patch"
+
 src_unpack(){
 	kde_src_unpack
 	# Assure a future version won't try to build this.