cruft removal

Package-Manager: portage-2.0.51.22-r2

13 files changed, 3 insertions, 670 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 86da7e12231e..b2e27f0fb0ce 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,30 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 8b8b6378e44670cc5708e13e5f747d0c clamav-0.85.ebuild 2314
-MD5 eb1cac4d8f85a1cc8621f6fb651fcbe3 clamav-0.85-r1.ebuild 3290
 MD5 6dbe81b45f8f77c88e48b0664e7e75c0 ChangeLog 18820
-MD5 3cbdf647d7091d6a0fcd36487baff673 clamav-0.86.2.ebuild 3701
-MD5 7a832f77b721edd70e3aa547dc744a60 clamav-0.86.ebuild 3705
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
-MD5 641e3e14bc321bc74351341a2ab52b05 clamav-0.86.1.ebuild 3704
-MD5 92c063f3dd51da71cbb2af5b6dbd4822 clamav-0.85.1-r1.ebuild 3675
-MD5 f5adcc9ba9b7da4b4188d75d3b0d5885 clamav-0.85.1.ebuild 3324
-MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
+MD5 3cbdf647d7091d6a0fcd36487baff673 clamav-0.86.2.ebuild 3701
 MD5 08f7b320461c04bbb88555e389c2e544 files/clamav-milter.README.gentoo 1124
+MD5 e29ee77ca9bfe28ed18dbf67a9c90e75 files/clamd.conf 193
+MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
 MD5 f6bf5b894e60e8686cb5a36ba240e1ef files/clamd.rc.new 2032
-MD5 81f7f63e7cb877af7cb982e5a2d67677 files/digest-clamav-0.86.1 66
-MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85-r1 64
-MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1 66
 MD5 8365b1166d97452566de3f0f5140ab43 files/digest-clamav-0.86.2 66
-MD5 f39518e9307018776f037f161e788d2a files/digest-clamav-0.86 64
-MD5 1b3268d3723e003ad99bf706e6bf4312 files/clamd.rc 1444
-MD5 102cc388dbea3446ba249cfc2e80cff3 files/digest-clamav-0.85.1-r1 66
-MD5 0bd0d31062475433335752e126830799 files/digest-clamav-0.85 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC5p1UKf2g/qXtneoRArjlAJ4n1LI56/vdpDMwxkphE9iI4JMq1wCgorHz
-Y8OPQYU+hQJB++qaxJNvZ4w=
-=K+Iw
------END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.85-r1.ebuild b/app-antivirus/clamav/clamav-0.85-r1.ebuild
deleted file mode 100644
index 5e1b58e67dfb..000000000000
--- a/app-antivirus/clamav/clamav-0.85-r1.ebuild
+++ /dev/null
@@ -1,104 +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.85-r1.ebuild,v 1.3 2005/07/09 18:53:12 swegener 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 ~ia64"
-IUSE="crypt milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if ! built_with_use mail-mta/sendmail milter; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	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 id utility instead of /etc/passwd parsing (bug #72540)
-	myconf="${myconf} --enable-id-check"
-	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 FAQ INSTALL
-	newinitd ${FILESDIR}/clamd.rc.new clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/freshclam.conf
-}
-
-pkg_postinst() {
-	echo
-	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
-	ewarn "START_CLAMD and START_FRESHCLAM. All settings are read from /etc/clamd.conf"
-	ewarn "and /etc/freshclam.conf, so double-check these two files."
-	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.85.1-r1.ebuild b/app-antivirus/clamav/clamav-0.85.1-r1.ebuild
deleted file mode 100644
index 9f5cd8b89646..000000000000
--- a/app-antivirus/clamav/clamav-0.85.1-r1.ebuild
+++ /dev/null
@@ -1,118 +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.85.1-r1.ebuild,v 1.12 2005/07/09 18:53:12 swegener 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="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="crypt mailwrapper milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if [ ! -e /usr/lib/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	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 id utility instead of /etc/passwd parsing (bug #72540)
-	myconf="${myconf} --enable-id-check"
-	use milter && {
-		myconf="${myconf} --enable-milter"
-		use mailwrapper && \
-			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
-	}
-
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
-	newconfd ${FILESDIR}/clamd.conf clamd
-	newinitd ${FILESDIR}/clamd.rc.new clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/freshclam.conf
-
-	if use milter ; then
-		echo "START_MILTER=no" \
-			>> ${D}/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>${D}/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
-	ewarn "START_CLAMD, START_FRESHCLAM and MILTER related options. All settings are"
-	ewarn "read from /etc/clamd.conf and /etc/freshclam.conf, so double-check these two files."
-	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 "zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.85.1.ebuild b/app-antivirus/clamav/clamav-0.85.1.ebuild
deleted file mode 100644
index 7e686afda743..000000000000
--- a/app-antivirus/clamav/clamav-0.85.1.ebuild
+++ /dev/null
@@ -1,105 +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.85.1.ebuild,v 1.7 2005/07/09 18:53:12 swegener 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="~alpha ~amd64 hppa ~ia64 ~ppc ppc64 sparc x86"
-IUSE="crypt milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if ! built_with_use mail-mta/sendmail milter; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	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 id utility instead of /etc/passwd parsing (bug #72540)
-	myconf="${myconf} --enable-id-check"
-	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 FAQ INSTALL
-	newinitd ${FILESDIR}/clamd.rc.new clamd
-	newconfd ${FILESDIR}/clamd.conf clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/freshclam.conf
-}
-
-pkg_postinst() {
-	echo
-	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
-	ewarn "START_CLAMD and START_FRESHCLAM. All settings are read from /etc/clamd.conf"
-	ewarn "and /etc/freshclam.conf, so double-check these two files."
-	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.85.ebuild b/app-antivirus/clamav/clamav-0.85.ebuild
deleted file mode 100644
index 00de7976809a..000000000000
--- a/app-antivirus/clamav/clamav-0.85.ebuild
+++ /dev/null
@@ -1,76 +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.85.ebuild,v 1.2 2005/07/09 18:53:12 swegener 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 ~ia64"
-IUSE="crypt milter selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=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"
-
-pkg_setup() {
-	if use milter; then
-		if ! built_with_use mail-mta/sendmail milter; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	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 FAQ INSTALL
-	newinitd ${FILESDIR}/clamd.rc clamd
-	newconfd ${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.86.1.ebuild b/app-antivirus/clamav/clamav-0.86.1.ebuild
deleted file mode 100644
index a7f4f3affb1b..000000000000
--- a/app-antivirus/clamav/clamav-0.86.1.ebuild
+++ /dev/null
@@ -1,118 +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.86.1.ebuild,v 1.8 2005/06/24 22:00:01 killerfox Exp $
-
-inherit eutils flag-o-matic fixheadtails
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="crypt milter selinux mailwrapper"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if [ ! -e /usr/lib/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	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 id utility instead of /etc/passwd parsing (bug #72540)
-	myconf="${myconf} --enable-id-check"
-	use milter && {
-		myconf="${myconf} --enable-milter"
-		use mailwrapper && \
-			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
-	}
-
-	ht_fix_file configure
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
-	newconfd ${FILESDIR}/clamd.conf clamd
-	newinitd ${FILESDIR}/clamd.rc.new clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/freshclam.conf
-
-	if use milter ; then
-		echo "START_MILTER=no" \
-			>> ${D}/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>${D}/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
-	ewarn "START_CLAMD, START_FRESHCLAM and MILTER related options. All settings are"
-	ewarn "read from /etc/clamd.conf and /etc/freshclam.conf, so double-check these two files."
-	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 how to setup the clamav-milter type:"
-		echo "  zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.86.ebuild b/app-antivirus/clamav/clamav-0.86.ebuild
deleted file mode 100644
index 049a66952354..000000000000
--- a/app-antivirus/clamav/clamav-0.86.ebuild
+++ /dev/null
@@ -1,118 +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.86.ebuild,v 1.1 2005/06/21 01:16:38 ticho Exp $
-
-inherit eutils flag-o-matic fixheadtails
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt milter selinux mailwrapper"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( mail-mta/sendmail )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	net-dns/libidn
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if [ ! -e /usr/lib/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag. Either recompile sendmail with milter USE flag enabled, or disable"
-			ewarn "this flag for clamav as well to disable milter support."
-			die "need milter-enabled sendmail"
-		fi
-	fi
-	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 id utility instead of /etc/passwd parsing (bug #72540)
-	myconf="${myconf} --enable-id-check"
-	use milter && {
-		myconf="${myconf} --enable-milter"
-		use mailwrapper && \
-			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
-	}
-
-	ht_fix_file configure
-	econf ${myconf} --with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ INSTALL
-	newconfd ${FILESDIR}/clamd.conf clamd
-	newinitd ${FILESDIR}/clamd.rc.new clamd
-	dodoc ${FILESDIR}/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/freshclam.log:" \
-		-e "s:^\#\(LogTime\).*:\1:" \
-		${D}/etc/freshclam.conf
-
-	if use milter ; then
-		echo "START_MILTER=no" \
-			>> ${D}/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>${D}/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	echo
-	ewarn "As of 0.85-r1, all settings from /etc/conf.d/clamd are ignored, except for"
-	ewarn "START_CLAMD, START_FRESHCLAM and MILTER related options. All settings are"
-	ewarn "read from /etc/clamd.conf and /etc/freshclam.conf, so double-check these two files."
-	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 how to setup the clamav-milter type:"
-		echo "  zless /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/files/digest-clamav-0.85 b/app-antivirus/clamav/files/digest-clamav-0.85
deleted file mode 100644
index dc72428f9d37..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.85
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz 4047244
diff --git a/app-antivirus/clamav/files/digest-clamav-0.85-r1 b/app-antivirus/clamav/files/digest-clamav-0.85-r1
deleted file mode 100644
index dc72428f9d37..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.85-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz 4047244
diff --git a/app-antivirus/clamav/files/digest-clamav-0.85.1 b/app-antivirus/clamav/files/digest-clamav-0.85.1
deleted file mode 100644
index 56f3267da58d..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.85.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz 4061042
diff --git a/app-antivirus/clamav/files/digest-clamav-0.85.1-r1 b/app-antivirus/clamav/files/digest-clamav-0.85.1-r1
deleted file mode 100644
index 56f3267da58d..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.85.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz 4061042
diff --git a/app-antivirus/clamav/files/digest-clamav-0.86 b/app-antivirus/clamav/files/digest-clamav-0.86
deleted file mode 100644
index a9deb3804d54..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.86
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz 3973117
diff --git a/app-antivirus/clamav/files/digest-clamav-0.86.1 b/app-antivirus/clamav/files/digest-clamav-0.86.1
deleted file mode 100644
index 8533dbba8ec8..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.86.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz 4016724