Clean up. Second try.

Package-Manager: portage-2.1.4.4

6 files changed, 8 insertions, 101 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/Manifest b/app-antivirus/klamav/Manifest
index 548ce71e6011..221b021b04ed 100644
--- a/app-antivirus/klamav/Manifest
+++ b/app-antivirus/klamav/Manifest
@@ -1,15 +1,9 @@
 AUX klamav-0.41-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
-AUX klamav-0.41.1-cl_loaddbdir.patch 653 RMD160 5130f329a36e2f38c3e5b8a5d84bd47940597084 SHA1 6a3b9f2a61e91eeaf06f17c1805f5209123c8589 SHA256 d6931d5840f1f45e623b53868bce9971397cbce88dea86342e15b350c303bfcd
-AUX klamav-0.41.1-gentempdesc.patch 429 RMD160 a3ed104558c966462cf672e0183345dd8af4a351 SHA1 eead0c8538918df289ee07f1e6f4b66ed8d04990 SHA256 c1210f34348406a297d4188ee37e209b355ab64b275a1fe4f5f480520d2f0b9e
 AUX klamav-0.42-clamav093.patch 4995 RMD160 bd8c88b62114a75180370cbb18b80b51b672db8a SHA1 499a7bc5b29455cf073a2576ec9dbd428bf024bf SHA256 9ab0ccbd7b714bdb7f93ebd16350a01cc47f2ff8c19f0e30909f1263b1a698b7
 AUX klamav-0.43-desktop-entry.diff 742 RMD160 e9466d6730f1c850a68ed60a20b6a2f2c46a53cf SHA1 1be211ff6c77dd4f9e5733d6dce66f4e0412711c SHA256 54b48efd0fac7abcf4335a8fcb17c868b06134e9467e8e5c79d213bf3ac199b2
-DIST klamav-0.41-source.tar.gz 1783244 RMD160 84c8b57fc8391624ec288b6b5fe0497a92e97baf SHA1 cf8d9d9f008057ab66b36e497cda375c95cba7f3 SHA256 7419db65041097129929064f065ae623e8e04a67a550ef24dff3d20223802340
-DIST klamav-0.41.1-source.tar.gz 1784785 RMD160 fa6115453f9e41c9fd03581aaac8073b8309614f SHA1 1cd14dbfb9a5e5bb0a24a04d0a421154476dceab SHA256 a57609a7948526bcd0f5b104acb77aa41b86263ebb7d9f93cd46443e2c244344
 DIST klamav-0.42-source.tar.gz 1920149 RMD160 75171ac0a35df29fd97132b1ecd2f345c671884f SHA1 122b439d03d29332286610aa9cf4052fb6f0d407 SHA256 3dd03c802a24d0fe033bdd7f27ec77b2fd5c9aedf18ebec30cee801e36966ca7
 DIST klamav-0.43-source.tar.gz 2029200 RMD160 f4f3205b8c9354f8b2ac419fb66dd9b248c4fd7e SHA1 218ad95937f90d102c493b4480f7b21ab19b7236 SHA256 de92736c18b47da69ffef17747f16c105d8772b2369026f82c2cec000c00a13e
-EBUILD klamav-0.41.1.ebuild 975 RMD160 c71201c7ba716c2f5483cccab770646e84536101 SHA1 a6a28c8e4c3fcc6f161dab68d21fb5a5c6d2253d SHA256 7e693dc01e90e0dff906fd3af5e44375afacce1df9d42a341991b9a0a45794ef
-EBUILD klamav-0.41.ebuild 935 RMD160 12f65375d1796b9d2a7ef83bf89c8e110ce3210e SHA1 3c72f5d90df72a670525bb51ee2068c6468963d7 SHA256 dbe5d95eddaa649cb828821256b6463bf25bc36a9c6d95b54bf88901904ae3c1
 EBUILD klamav-0.42.ebuild 1304 RMD160 3146c6464412d18f314985d73381588aa02aab2d SHA1 612d2108d82fb121f9cd68f1b07c5a077c79e596 SHA256 ba57390cee497fb3acedf64c18718a5ef73611dd2fe87ea7d81051f24a01d5ee
 EBUILD klamav-0.43.ebuild 1154 RMD160 ae715bc862896038239eb9e691dde1acb976a335 SHA1 0c01918811b1b6267cc4416cba7f7e6f06da4118 SHA256 0980ef9abf1f515665cf7d651af4d21fa87adda6ed140d8cdf666ea40daaaad1
-MISC ChangeLog 6234 RMD160 99753dad6456eb1beefbc69da5368cddc27300ba SHA1 73401eddc495f72581dc7ba5db1031a1b2c70edf SHA256 5ca155a6a2fe1713be4785f59a7c273a9df2bea25c21f1f5fff5599751cba591
+MISC ChangeLog 6439 RMD160 a3b65dd2e69cb0d0f003df72491b91f3cb4c263c SHA1 798420374304513a40a5e865376259ca00a449d4 SHA256 edcea0e595565642aa914819b48524ad0c7c0bd3c43ba2ff92c059d430112835
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
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"
-}