Version bump, closes #90958. Old ebuild cleanup.

(Portage version: 2.0.51.20-r5)

17 files changed, 35 insertions, 397 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 8b1785a22106..3357ad389fa4 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.63 2005/04/22 10:20:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.64 2005/05/01 18:09:54 ticho Exp $
+
+*clamav-0.84 (01 May 2005)
+
+  01 May 2005; Andrej Kacian <ticho@gentoo.org>
+  -files/clamav-0.82-MS05-002-false-positive-fix.patch,
+  -clamav-0.75.1.ebuild, -clamav-0.80.ebuild, -clamav-0.81.ebuild,
+  -clamav-0.82.ebuild, -clamav-0.82-r1.ebuild, clamav-0.83.ebuild,
+  -clamav-0.84_rc1.ebuild, +clamav-0.84.ebuild:
+  Version bump. Closes bug #90958, reported by djfunk <djfunk@free.fr>. Old
+  ebuild cleanup (yay!). Use newinitd and newconfd in ebuilds.
 
   22 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> clamav-0.84_rc1.ebuild:
   Add ~ia64 keyword.
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index e09ef13f12b2..80bafc9bb911 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,30 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0232ed41cb45a0d5a543d38e75568a32 ChangeLog 12775
-MD5 e6d1bcd1df3f5cad37b68ef51d9c3188 clamav-0.84_rc1.ebuild 2431
 MD5 9d62360a7a38f6147a6cfe97c777e035 clamav-0.80.ebuild 1790
-MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
-MD5 c612f2a84447b5614d5ccaeac253472d clamav-0.83.ebuild 2374
-MD5 4f620361b61c91340a4858f468d068d8 clamav-0.75.1.ebuild 1582
-MD5 6458783fa8618706c008bc8faba26f67 clamav-0.82-r1.ebuild 2088
 MD5 64d6a92024c638d9bbd9d4fd3b2fadf4 clamav-0.82.ebuild 1968
+MD5 6458783fa8618706c008bc8faba26f67 clamav-0.82-r1.ebuild 2088
+MD5 67d5e27a7987252824ccb01ef209754e clamav-0.84.ebuild 2219
+MD5 e6d1bcd1df3f5cad37b68ef51d9c3188 clamav-0.84_rc1.ebuild 2431
 MD5 f3e0a0e2a0af48eb9d16fc66fdb6f78f clamav-0.81.ebuild 1963
-MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166
+MD5 4f620361b61c91340a4858f468d068d8 clamav-0.75.1.ebuild 1582
+MD5 0232ed41cb45a0d5a543d38e75568a32 ChangeLog 12775
+MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
+MD5 c612f2a84447b5614d5ccaeac253472d clamav-0.83.ebuild 2374
+MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82-r1 64
 MD5 ad7d45b1be51c06986cb42c53e733d19 files/clamav-milter.README.gentoo 1311
-MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
+MD5 0eb8dba84172713f496d6305e91576e6 files/digest-clamav-0.84_rc1 67
+MD5 611be9042d6d7b2b1668df9d55b97c58 files/clamav-0.82-MS05-002-false-positive-fix.patch 626
 MD5 f0090a77dc10ba3899900622336b8610 files/digest-clamav-0.75.1 66
-MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82 64
+MD5 a42aa0e5135bd2ad22288e4150ec89e2 files/digest-clamav-0.80 64
 MD5 90e45ae4932ab5efa4baa1936e016e10 files/digest-clamav-0.81 64
-MD5 611be9042d6d7b2b1668df9d55b97c58 files/clamav-0.82-MS05-002-false-positive-fix.patch 626
+MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82 64
+MD5 9bbf2754f8178fd5164875d784aa9ffa files/digest-clamav-0.83 64
+MD5 3e9877b8901f604bd65ea89ff18833b6 files/digest-clamav-0.84 64
+MD5 e8dcbdecd955708ddc7c79399ffa6276 files/clamd.conf 166
 MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
-MD5 21e06147c74a196e333ab2feafff5998 files/digest-clamav-0.82-r1 64
-MD5 a42aa0e5135bd2ad22288e4150ec89e2 files/digest-clamav-0.80 64
-MD5 0eb8dba84172713f496d6305e91576e6 files/digest-clamav-0.84_rc1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCaM/yKf2g/qXtneoRAgFKAJ4pl0fO8POQuWsyOiErEvbFg/DgAACgq7xI
-6FhXCnuEFWsF8yLfJEBQIOw=
-=qNed
------END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.75.1.ebuild b/app-antivirus/clamav/clamav-0.75.1.ebuild
deleted file mode 100644
index 2a3c5e3027dd..000000000000
--- a/app-antivirus/clamav/clamav-0.75.1.ebuild
+++ /dev/null
@@ -1,58 +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/clamav/clamav-0.75.1.ebuild,v 1.10 2005/01/26 21:27:40 kaiowas Exp $
-
-inherit eutils flag-o-matic
-
-#MY_P="${PN}-0.70-rc"
-MY_P="${P}"
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE="milter crypt selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-src_compile() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	local myconf
-	use milter && myconf="--enable-milter"
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	einfo ""
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them with: /etc/init.d/clamd restart"
-	einfo ""
-	if use milter ; then
-		einfo "For simple instructions howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.80.ebuild b/app-antivirus/clamav/clamav-0.80.ebuild
deleted file mode 100644
index 92aa7556cfde..000000000000
--- a/app-antivirus/clamav/clamav-0.80.ebuild
+++ /dev/null
@@ -1,61 +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/clamav/clamav-0.80.ebuild,v 1.13 2005/02/06 18:01:35 corsair Exp $
-
-inherit eutils flag-o-matic
-
-#MY_P="${PN}-0.80rc3"
-MY_P="${P}"
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc amd64 hppa ~alpha ppc64"
-IUSE="milter crypt selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-src_compile() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	local myconf
-	use milter && myconf="--enable-milter"
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
-	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
-	einfo "      configuration accordingly before (re)starting clamd."
-	einfo ""
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them with: /etc/init.d/clamd restart"
-	einfo ""
-	if use milter ; then
-		einfo "For simple instructions howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.81.ebuild b/app-antivirus/clamav/clamav-0.81.ebuild
deleted file mode 100644
index c51e2991f818..000000000000
--- a/app-antivirus/clamav/clamav-0.81.ebuild
+++ /dev/null
@@ -1,68 +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/clamav/clamav-0.81.ebuild,v 1.7 2005/01/30 20:02:04 kloeri Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64 ~hppa alpha ~ppc64"
-IUSE="crypt milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-#S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-src_compile() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	local myconf
-
-	# we depend on fixed zlib, so we can disable this check to prevent redundant
-	# warning (bug #61749)
-	myconf="${myconf} --disable-zlib-vcheck"
-
-	use milter && myconf="${myconf} --enable-milter"
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	echo
-	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
-	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
-	einfo "      configuration accordingly before (re)starting clamd."
-	echo
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them with: /etc/init.d/clamd restart"
-	echo
-	if use milter ; then
-		einfo "For simple instructions howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.82-r1.ebuild b/app-antivirus/clamav/clamav-0.82-r1.ebuild
deleted file mode 100644
index 518db24c6776..000000000000
--- a/app-antivirus/clamav/clamav-0.82-r1.ebuild
+++ /dev/null
@@ -1,75 +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/clamav/clamav-0.82-r1.ebuild,v 1.6 2005/03/10 14:39:35 ticho Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc amd64 hppa ~alpha ~ppc64"
-IUSE="crypt milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-#S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-MS05-002-false-positive-fix.patch || die
-}
-
-src_compile() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	local myconf
-
-	# we depend on fixed zlib, so we can disable this check to prevent redundant
-	# warning (bug #61749)
-	myconf="${myconf} --disable-zlib-vcheck"
-
-	use milter && myconf="${myconf} --enable-milter"
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	echo
-	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
-	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
-	einfo "      configuration accordingly before (re)starting clamd."
-	echo
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them with: /etc/init.d/clamd restart"
-	echo
-	if use milter ; then
-		einfo "For simple instructions howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.82.ebuild b/app-antivirus/clamav/clamav-0.82.ebuild
deleted file mode 100644
index 180ca8ea6677..000000000000
--- a/app-antivirus/clamav/clamav-0.82.ebuild
+++ /dev/null
@@ -1,68 +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/clamav/clamav-0.82.ebuild,v 1.3 2005/02/08 18:02:22 gustavoz Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc ~amd64 ~hppa ~alpha ~ppc64"
-IUSE="crypt milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0"
-RDEPEND="selinux? ( sec-policy/selinux-clamav )"
-PROVIDE="virtual/antivirus"
-
-#S="${WORKDIR}/${P/_/}"
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 /bin/false /dev/null clamav
-	pwconv || die
-}
-
-src_compile() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	local myconf
-
-	# we depend on fixed zlib, so we can disable this check to prevent redundant
-	# warning (bug #61749)
-	myconf="${myconf} --disable-zlib-vcheck"
-
-	use milter && myconf="${myconf} --enable-milter"
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-}
-
-pkg_postinst() {
-	echo
-	einfo "NOTE: As of clamav-0.80, the config file for clamd is no longer"
-	einfo "      /etc/clamav.conf, but /etc/clamd.conf. Adjust your"
-	einfo "      configuration accordingly before (re)starting clamd."
-	echo
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them with: /etc/init.d/clamd restart"
-	echo
-	if use milter ; then
-		einfo "For simple instructions howto setup the clamav-milter..."
-		einfo ""
-		einfo "less /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.83.ebuild b/app-antivirus/clamav/clamav-0.83.ebuild
index 93e0967c31ab..dca38df7f0d6 100644
--- a/app-antivirus/clamav/clamav-0.83.ebuild
+++ b/app-antivirus/clamav/clamav-0.83.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.83.ebuild,v 1.10 2005/04/08 10:41:44 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.83.ebuild,v 1.11 2005/05/01 18:09:54 ticho Exp $
 
 inherit eutils flag-o-matic
 
@@ -55,8 +55,8 @@ src_compile() {
 src_install() {
 	make DESTDIR=${D} install || die
 	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
+	newinitd ${FILESDIR}/clamd.rc clamd
+	newconfd ${FILESDIR}/clamd.conf clamd
 	dodoc ${FILESDIR}/clamav-milter.README.gentoo
 }
 
diff --git a/app-antivirus/clamav/clamav-0.84_rc1.ebuild b/app-antivirus/clamav/clamav-0.84.ebuild
index 8f4c63816759..907a3295df16 100644
--- a/app-antivirus/clamav/clamav-0.84_rc1.ebuild
+++ b/app-antivirus/clamav/clamav-0.84.ebuild
@@ -1,15 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.84_rc1.ebuild,v 1.2 2005/04/22 10:20:14 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.84.ebuild,v 1.1 2005/05/01 18:09:54 ticho Exp $
 
 inherit eutils flag-o-matic
 
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/clamav/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/clamav/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,8 +22,6 @@ DEPEND="virtual/libc
 RDEPEND="selinux? ( sec-policy/selinux-clamav )"
 PROVIDE="virtual/antivirus"
 
-S="${WORKDIR}/${MY_P}"
-
 pkg_setup() {
 	if use milter; then
 		if ! built_with_use mail-mta/sendmail milter; then
@@ -57,9 +52,9 @@ src_compile() {
 
 src_install() {
 	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
-	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
-	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
+	newinitd ${FILESDIR}/clamd.rc clamd
+	newconfd ${FILESDIR}/clamd.conf clamd
 	dodoc ${FILESDIR}/clamav-milter.README.gentoo
 }
 
diff --git a/app-antivirus/clamav/files/clamav-0.82-MS05-002-false-positive-fix.patch b/app-antivirus/clamav/files/clamav-0.82-MS05-002-false-positive-fix.patch
deleted file mode 100644
index 3323864a5a20..000000000000
--- a/app-antivirus/clamav/files/clamav-0.82-MS05-002-false-positive-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -bur clamav-0.82/libclamav/special.c clamav-0.82-fixed/libclamav/special.c
---- clamav-0.82/libclamav/special.c	2005-02-05 16:47:47.000000000 +0100
-+++ clamav-0.82-fixed/libclamav/special.c	2005-02-13 18:40:08.923297848 +0100
-@@ -224,6 +224,12 @@
- 		return 0;
- 	}
- 
-+	if (memcmp(&form_type, "ACON", 4) != 0) {
-+		/* Only scan MS animated icon files */
-+		/* There is a *lot* of broken software out there that produces bad RIFF files */
-+		return 0;
-+	}
-+
- 	chunk_size = riff_endian_convert_32(chunk_size, big_endian);
- 
- 	do {
-@@ -234,6 +240,6 @@
- 
- 	if (offset < chunk_size) {
- 		retval = 2;
--	};
-+	}
- 	return retval;
- }
diff --git a/app-antivirus/clamav/files/digest-clamav-0.75.1 b/app-antivirus/clamav/files/digest-clamav-0.75.1
deleted file mode 100644
index c411f8e1705e..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.75.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c85b7957eba9fd9e9ff8c2537ae006f clamav-0.75.1.tar.gz 2777319
diff --git a/app-antivirus/clamav/files/digest-clamav-0.80 b/app-antivirus/clamav/files/digest-clamav-0.80
deleted file mode 100644
index d5b51c61a4f1..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.80
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59bf21e169a35d7e9c27a34435f9b870 clamav-0.80.tar.gz 2679434
diff --git a/app-antivirus/clamav/files/digest-clamav-0.81 b/app-antivirus/clamav/files/digest-clamav-0.81
deleted file mode 100644
index 760e821106c1..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.81
+++ /dev/null
@@ -1 +0,0 @@
-MD5 60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz 3347423
diff --git a/app-antivirus/clamav/files/digest-clamav-0.82 b/app-antivirus/clamav/files/digest-clamav-0.82
deleted file mode 100644
index 2f92ff85ec7b..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.82
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz 3565864
diff --git a/app-antivirus/clamav/files/digest-clamav-0.82-r1 b/app-antivirus/clamav/files/digest-clamav-0.82-r1
deleted file mode 100644
index 2f92ff85ec7b..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.82-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz 3565864
diff --git a/app-antivirus/clamav/files/digest-clamav-0.84 b/app-antivirus/clamav/files/digest-clamav-0.84
new file mode 100644
index 000000000000..53c23dd21f81
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.84
@@ -0,0 +1 @@
+MD5 c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz 4006624
diff --git a/app-antivirus/clamav/files/digest-clamav-0.84_rc1 b/app-antivirus/clamav/files/digest-clamav-0.84_rc1
deleted file mode 100644
index 6cc7c5845a49..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.84_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43cf89ccf2a3854aef7d0716433b44fe clamav-0.84rc1.tar.gz 3864208