Fix compile thanks to jmbsvicetto in bug 169731

(Portage version: 2.1.2-r12)

22 files changed, 24 insertions, 323 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/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.