Remove old ones, slot change to 3.5

(Portage version: 2.2_rc33/cvs/Linux x86_64)

8 files changed, 10 insertions, 276 deletions

diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog
index 7704487a4a67..fd3fba6e6556 100644
--- a/app-antivirus/klamav/ChangeLog
+++ b/app-antivirus/klamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/klamav
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.59 2009/05/23 10:27:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.60 2009/06/09 12:39:35 tampakrap Exp $
+
+  09 Jun 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  -files/klamav-0.41-cl_loaddbdir.patch, -klamav-0.44.ebuild,
+  -files/klamav-clamav094.patch, -klamav-0.42.ebuild,
+  -files/klamav-0.42-clamav093.patch, -klamav-0.45.ebuild,
+  klamav-0.46.ebuild:
+  Remove old ones, change slot to 3.5
 
   23 May 2009; Markus Meier <maekke@gentoo.org> klamav-0.46.ebuild:
   amd64 stable, bug #265545
diff --git a/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch b/app-antivirus/klamav/files/klamav-0.41-cl_loaddbdir.patch
deleted file mode 100644
index 202d942b1aff..000000000000
--- a/app-antivirus/klamav/files/klamav-0.41-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.42-clamav093.patch b/app-antivirus/klamav/files/klamav-0.42-clamav093.patch
deleted file mode 100644
index c4f81ad07042..000000000000
--- a/app-antivirus/klamav/files/klamav-0.42-clamav093.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -ur klamav-0.42/src/klammail/cfgparser.c klamav-0.42-clamav093/src/klammail/cfgparser.c
---- klamav-0.42/src/klammail/cfgparser.c	2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/klammail/cfgparser.c	2008-03-28 07:00:26.000000000 +0100
-@@ -63,10 +63,10 @@
- 	    {"ScanOLE2", OPT_NOARG},
- 	    {"ScanArchive", OPT_NOARG},
- 	    {"ScanRAR", OPT_NOARG},
--	    {"ArchiveMaxFileSize", OPT_COMPSIZE},
--	    {"ArchiveMaxRecursion", OPT_NUM},
--	    {"ArchiveMaxFiles", OPT_NUM},
--	    {"ArchiveMaxCompressionRatio", OPT_NUM},
-+	    {"MaxScanSize", OPT_COMPSIZE},
-+	    {"MaxFileSize", OPT_COMPSIZE},
-+	    {"MaxRecursion", OPT_NUM},
-+	    {"MaxFiles", OPT_NUM},
- 	    {"ArchiveLimitMemoryUsage", OPT_NOARG},
- 	    {"ArchiveBlockEncrypted", OPT_NOARG},
- 	    {"DataDirectory", OPT_STR}, /* obsolete */
-diff -ur klamav-0.42/src/klammail/clamdmail.c klamav-0.42-clamav093/src/klammail/clamdmail.c
---- klamav-0.42/src/klammail/clamdmail.c	2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/klammail/clamdmail.c	2008-03-28 07:10:31.000000000 +0100
-@@ -151,14 +151,14 @@
-                 while((bytes = read(0, buff, BUFFSIZE)) > 0) {
- 
-                         if(write(fd, buff, bytes) != bytes) {
--                                cli_dbgmsg("clamdmail -> Can't write() file.\n");
-+                                printf("clamdmail -> Can't write() file.\n");
-                                 close(fd);
-                                 return CL_EMEM;
-                         }
-                 }
- 
-                 if(fsync(fd) == -1) {
--                        cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
-+                        printf("fsync() failed for descriptor %d\n", fd);
-                         close(fd);
-                         return CL_EFSYNC;
-                 }
-@@ -202,13 +202,12 @@
-                         /* set up archive limits */
-                         memset(&limits, 0, sizeof(struct cl_limits));
-                         limits.maxfiles = 1000; /* max files */
--                        limits.maxfilesize = 10 * 1048576; /* maximum size of archived/compressed
-+                        limits.maxfilesize = 10 * 1048576; /* maximum size of
-                                                             * file (files exceeding this limit
-                                                             * will be ignored)
-                                                             */
--                        limits.maxreclevel = 5; /* maximum recursion level for archives */
--                        limits.maxmailrec = 64; /* maximum recursion level for mail files */
--                        limits.maxratio = 200; /* maximum compression ratio */
-+                        limits.maxreclevel = 5; /* maximum recursion level for archives and mail files */
-+                        limits.maxscansize = 200 * limits.maxfilesize; /* maximum compression ratio */
- 
-                         ret = cl_scandesc(fd, &virname, &size, engine, &limits, CL_SCAN_STDOPT | CL_ARCHIVE | CL_MAIL | CL_OLE2 | CL_SCAN_HTML);
- 
-@@ -368,7 +367,7 @@
-                                 while((bytes = read(fd, buff, BUFFSIZE)) > 0) {
-         
-                                         if(write(1, buff, bytes) != bytes) {
--                                        cli_dbgmsg("clamdmail -> Can't write() file.\n");
-+                                        printf("clamdmail -> Can't write() file.\n");
-                                                 close(fd);
-                                                 return CL_EMEM;
-                                         }
-diff -ur klamav-0.42/src/scanviewer.cpp klamav-0.42-clamav093/src/scanviewer.cpp
---- klamav-0.42/src/scanviewer.cpp	2008-01-06 17:00:35.000000000 +0100
-+++ klamav-0.42-clamav093/src/scanviewer.cpp	2008-03-28 07:00:26.000000000 +0100
-@@ -393,18 +393,18 @@
-         options += "--max-files=" + QString("%1").arg(KlamavConfig::noFilesToExtract()) + " ";
- 
-     if (KlamavConfig::mBsToExtract() > 0)
--        options += "--max-space=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
-+        options += "--max-filesize=" + QString("%1").arg(KlamavConfig::mBsToExtract()) + " ";
-         
--    if (KlamavConfig::compressionRatio() > 0)
--        options += "--max-ratio=" + QString("%1").arg(KlamavConfig::compressionRatio()) + " ";
-+    if (KlamavConfig::mBsToExtract() > 0 && KlamavConfig::compressionRatio() > 0)
-+        options += "--max-scansize=" + QString("%1").arg(KlamavConfig::mBsToExtract() * KlamavConfig::compressionRatio()) + " ";
- 
-     if (KlamavConfig::recursionLevel() > 0)
-         options += "--max-recursion=" + QString("%1").arg(KlamavConfig::recursionLevel()) + " ";
- 
- 
-     //config->setGroup("Klamscan");
--    if (KlamavConfig::virusLimitsExceeded())
--        options += "--block-max ";
-+//    if (KlamavConfig::virusLimitsExceeded())
-+//        options += "--block-max ";
- 
-     if (KlamavConfig::virusEncrypted())
-         options += "--block-encrypted ";
diff --git a/app-antivirus/klamav/files/klamav-clamav094.patch b/app-antivirus/klamav/files/klamav-clamav094.patch
deleted file mode 100644
index 5131cf911375..000000000000
--- a/app-antivirus/klamav/files/klamav-clamav094.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -ur klamav-0.44/src/klammail/clamdmail.c klamav-0.44-clamav094/src/klammail/clamdmail.c
---- klamav-0.44/src/klammail/clamdmail.c        2008-07-06 14:05:39.000000000 +0200
-+++ klamav-0.44-clamav094/src/klammail/clamdmail.c      2008-09-06 13:51:46.000000000 +0200
-@@ -160,7 +160,8 @@
-                 if(fsync(fd) == -1) {
- //                         cli_dbgmsg("fsync() failed for descriptor %d\n", fd);
-                         close(fd);
--                        return CL_EFSYNC;
-+//                        return CL_EFSYNC;
-+                       return CL_EIO;
-                 }
- 
-                 close(fd);
-
diff --git a/app-antivirus/klamav/klamav-0.42.ebuild b/app-antivirus/klamav/klamav-0.42.ebuild
deleted file mode 100644
index 0021688202ba..000000000000
--- a/app-antivirus/klamav/klamav-0.42.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.42.ebuild,v 1.9 2008/09/06 15:19:41 keytoaster 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/${PN}/${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.5
-
-PATCHES=( "${FILESDIR}/${PN}-0.41-cl_loaddbdir.patch" )
-
-src_unpack(){
-	kde_src_unpack
-
-	# Make things work with clamav versions >= 0.93. Fixes bug 219021.
-	if has_version '>=app-antivirus/clamav-0.93' ; then
-		epatch "${FILESDIR}/${P}-clamav093.patch"
-	fi
-
-	# Fix compiliaton error with >=clamav-0.94, bug #236838
-	if has_version '>=app-antivirus/clamav-0.94' ; then
-		epatch "${FILESDIR}/klamav-clamav094.patch"
-	fi
-
-	# Assure a future version won't try to build this.
-	rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
-
-	rm -f "${S}"/configure
-}
-
-src_compile(){
-	# Disable updates from the GUI. We have package managers for that. cf. bug 171414
-	myconf="--with-disableupdates"
-	kde_src_compile
-}
-
-pkg_postinst(){
-	elog "The on-access scanning functionality is provided by"
-	elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
-}
diff --git a/app-antivirus/klamav/klamav-0.44.ebuild b/app-antivirus/klamav/klamav-0.44.ebuild
deleted file mode 100644
index dbf7ced59e31..000000000000
--- a/app-antivirus/klamav/klamav-0.44.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.44.ebuild,v 1.7 2009/02/25 12:50:01 josejx Exp $
-
-ARTS_REQUIRED="never"
-
-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/${PN}/${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.5
-
-src_unpack(){
-	kde_src_unpack
-
-	# Fix .desktop entry.
-	epatch "${FILESDIR}/klamav-0.43-desktop-entry.diff"
-
-	# Fix compiliaton error with >=clamav-0.94, bug #236838
-	if has_version '>=app-antivirus/clamav-0.94' ; then
-		epatch "${FILESDIR}/klamav-clamav094.patch"
-	fi
-
-	# Assure a future version won't try to build this.
-	rm -rf "${WORKDIR}/${MY_P}/dazuko"* || die "We missed to eradicate some files"
-
-	rm -f "${S}"/configure
-}
-
-src_compile(){
-	# Disable updates from the GUI. We have package managers for that. cf. bug 171414
-	myconf="--with-disableupdates"
-	kde_src_compile
-}
-
-pkg_postinst(){
-	kde_pkg_postinst
-
-	elog "The on-access scanning functionality is provided by"
-	elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
-}
diff --git a/app-antivirus/klamav/klamav-0.45.ebuild b/app-antivirus/klamav/klamav-0.45.ebuild
deleted file mode 100644
index 3767d6b4cc82..000000000000
--- a/app-antivirus/klamav/klamav-0.45.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.45.ebuild,v 1.1 2009/02/22 13:35:43 carlo Exp $
-
-ARTS_REQUIRED="never"
-
-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/${PN}/${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.5
-
-PATCHES=(
-	"${FILESDIR}/klamav-0.43-desktop-entry.diff"
-	)
-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"
-
-	rm -f "${S}"/configure
-}
-
-src_compile(){
-	# Disable updates from the GUI. We have package managers for that. cf. bug 171414
-	myconf="--with-disableupdates"
-	kde_src_compile
-}
-
-pkg_postinst(){
-	kde_pkg_postinst
-
-	elog "The on-access scanning functionality is provided by"
-	elog "the Dazuko kernel module. To use it, install sys-fs/dazuko."
-}
diff --git a/app-antivirus/klamav/klamav-0.46.ebuild b/app-antivirus/klamav/klamav-0.46.ebuild
index 1d4bd115630b..4bd6b4cab900 100644
--- a/app-antivirus/klamav/klamav-0.46.ebuild
+++ b/app-antivirus/klamav/klamav-0.46.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.46.ebuild,v 1.5 2009/05/23 10:27:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.46.ebuild,v 1.6 2009/06/09 12:39:35 tampakrap Exp $
 
 ARTS_REQUIRED="never"
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://klamav.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 
-SLOT="0"
+SLOT="3.5"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE=""