Clean up. Second try.

(Portage version: 2.1.4.4)

5 files changed, 7 insertions, 94 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 9482ceb70e5a..05a020bb6e83 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-antivirus/klamav
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.45 2008/05/17 20:00:41 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.46 2008/05/17 20:02:43 carlo Exp $
+
+  17 May 2008; Carsten Lohrke <carlo@gentoo.org>
+  -files/klamav-0.41.1-cl_loaddbdir.patch,
+  -files/klamav-0.41.1-gentempdesc.patch, -klamav-0.41.ebuild,
+  -klamav-0.41.1.ebuild:
+  Clean up. Second try.
 
   17 May 2008; Carsten Lohrke <carlo@gentoo.org> -klamav-0.38.ebuild:
   Clean up.
diff --git a/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch b/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch
deleted file mode 100644
index 202d942b1aff..000000000000
--- a/app-antivirus/klamav/files/klamav-0.41.1-cl_loaddbdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/files/klamav-0.41.1-gentempdesc.patch b/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch
deleted file mode 100644
index f204c953d34d..000000000000
--- a/app-antivirus/klamav/files/klamav-0.41.1-gentempdesc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- klamav-0.41.1/src/klamd/scanner.c.orig	2007-12-19 10:38:11.000000000 +0100
-+++ klamav-0.41.1/src/klamd/scanner.c	2007-12-19 10:43:12.000000000 +0100
-@@ -396,7 +396,7 @@
- 
-     logg("*Accepted connection on port %d, fd %d\n", port, acceptd);
- 
--    if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {
-+    if (cli_gentempfd(NULL, &tmpname, &tmpd) != CL_SUCCESS) {
- 	shutdown(sockfd, 2);
- 	close(sockfd);
- 	close(acceptd);
diff --git a/app-antivirus/klamav/klamav-0.41.1.ebuild b/app-antivirus/klamav/klamav-0.41.1.ebuild
deleted file mode 100644
index 3477395d7faa..000000000000
--- a/app-antivirus/klamav/klamav-0.41.1.ebuild
+++ /dev/null
@@ -1,36 +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.41.1.ebuild,v 1.3 2007/12/31 18:21:21 carlo 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.92"
-RDEPEND="${DEPEND}"
-
-need-kde 3.5
-
-PATCHES="${FILESDIR}/${P}-cl_loaddbdir.patch
-	${FILESDIR}/${P}-gentempdesc.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
deleted file mode 100644
index 1640c0ff52a5..000000000000
--- a/app-antivirus/klamav/klamav-0.41.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.41.ebuild,v 1.8 2007/12/30 12:50:17 mattepiu 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}-cl_loaddbdir.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"
-}