Cleanup

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r7 x86_64

14 files changed, 11 insertions, 1192 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index fe5d306d5ae0..4617f8540abd 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.298 2008/09/05 19:44:47 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.299 2008/09/05 19:51:07 dertobi123 Exp $
+
+  05 Sep 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/clamav-0.90-compat.patch, -files/clamav-0.90-nls.patch,
+  -files/clamav-0.91.2-CVE-2007-5759.patch,
+  -files/clamav-0.91.2-CVE-2007-6336.patch,
+  -files/clamav-0.91.2-CVE-2007-6337.patch, -clamav-0.91.2.ebuild,
+  -clamav-0.91.2-r1.ebuild, -clamav-0.92.ebuild, -clamav-0.92.1.ebuild,
+  -clamav-0.92.1-r1.ebuild, -clamav-0.93.ebuild, -clamav-0.93.1.ebuild:
+  Cleanup
 
 *clamav-0.94 (05 Sep 2008)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index a0e9212f7ac3..4d705e4676bd 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,8 +1,3 @@
-AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 SHA1 fedfe373a6a911230c553fd5a095c8acb72b4ce2 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9
-AUX clamav-0.90-nls.patch 2531 RMD160 442990f305b47bd0eb4c459e9ed054612259992e SHA1 4e74b895739ff1aa1929a444f9e89dbe0f18a30c SHA256 b160e11ee12df6634cb8d524816f8bba08c7cd5b6154f9bff671423a8e0031a3
-AUX clamav-0.91.2-CVE-2007-5759.patch 1852 RMD160 13ff700734cca239c7960dbd1a0e7a9c4c6d4b72 SHA1 48707d513348dd87ff74beaff7370a91a097acec SHA256 78ce1337e563b6db5d7604efb14aebf9b9bf02330dd67c4d50a6e231f1921e0d
-AUX clamav-0.91.2-CVE-2007-6336.patch 1002 RMD160 dd72433cba5bea2b163a09d82fc5c45d14a980ae SHA1 482fa318c9d1172c1a2b3a652936e8a417e11817 SHA256 c4a09b072fa4c4f0c3fde0c8a93984e081dd702454fd990abc93a45529b01dca
-AUX clamav-0.91.2-CVE-2007-6337.patch 891 RMD160 491e27ad67741a04891e522ec2f4f7ba25f91381 SHA1 e02199c35043a1811a077e7fb6a7044dd820d12b SHA256 d6552c8990fc82fd8072b0e331ec7c1bf4ef7f3899d2edf7a2b9991bd6f2337a
 AUX clamav-0.93-buildfix.patch 936 RMD160 ce5c8297fdbd3d9fc306003d6010dba45de89c45 SHA1 e6ed67358100019c7fc78ff454cb964549330616 SHA256 d5e45ae6f9a4faee8325bbb0cbdabb8a6023130fc4e78085415c25fcbeb6b7d2
 AUX clamav-0.93-nls.patch 2405 RMD160 b95a897cdd6a007cd6b70fde233fd29e5244ad50 SHA1 7cec15f8723f842e03f1a35ded5e094826844bde SHA256 59e44aaf1a9a0aa1d94ed2d0177e886c3376506f666587a753ef20022d049dd8
 AUX clamav-0.94-buildfix.patch 827 RMD160 74531c8223d61b96824e00325c2b8d6506dd583e SHA1 55c6d7dee019eb5b422946746e322db5efbf933a SHA256 df13dce6729b0a1aa06d792f71de2c496388e200545a1797ba8e90ef6ffd3d03
@@ -12,21 +7,9 @@ AUX clamav.logrotate 355 RMD160 f59cd8ce96da8210aa858ee59ee3b6940e3253a6 SHA1 5f
 AUX clamd.conf 234 RMD160 b517b05e587637cbdd443f7ca3625d582e32722f SHA1 564b1e2f6cf85567f69f2e20cbc942967fa6304b SHA256 17bf4fe3596dc5b145e4163d85181e2edcaa214df3cf9072d852ba0e7a569891
 AUX clamd.rc 3686 RMD160 0298ad54c13bb2c9d2e667270546308dbc581d7d SHA1 22299bf3a4812afbf45b792c55bc31c552fe12df SHA256 0f68262e6c55883d2f32cfdbbfeb33f64fc9c4bf019f59ae6b7bc864fa2d346c
 AUX lib-ld.m4 3417 RMD160 7b412510e7ef9966f70ed29937e3556283128a9b SHA1 8b72b8f5f76e41e4ca0f2521c06c568490894a84 SHA256 18c4c458009da32c9daf0ea332a539e5edc82ba009b6c2faac004626313f00e5
-DIST clamav-0.91.2.tar.gz 13394538 RMD160 9e181a7a4fd08377ff47663aed27f8cc97249a21 SHA1 f18007c3045a1d78967adad805c6934d46ca6419 SHA256 dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0
-DIST clamav-0.92.1.tar.gz 15284752 RMD160 5cf4b36a665dba6be366e94d02b6c8112048d647 SHA1 6ee4fa5a1c5f71eecc99beb17bc5f3c5a3b580ec SHA256 e08a63adb3eda3dfc190d7a8b3fa55c881b1632583fbdf67327d3767d6966581
-DIST clamav-0.92.tar.gz 14300798 RMD160 37f0450b9b3c6fc863f94811ae372ece1677d791 SHA1 b6573acd9a7bb6bf3bd4b39a0102ce0be764c5bc SHA256 d3c8c1e2e0025a354663b330d69c8848c7a5c9d7248204c69362c2924366025e
-DIST clamav-0.93.1.tar.gz 17246314 RMD160 22296401b3ce96a268f0db224e72c31e69090895 SHA1 3306f3cd289aac3793962c9834cd1bd500abfb0c SHA256 c9a3991107dd377a63cfe7866417c5e29b3bffc9332aa5979bcc74ddb78d6bb6
 DIST clamav-0.93.3.tar.gz 18242568 RMD160 8379148790cc545c801709d46b7db87634f43f67 SHA1 01240613b639144fa8fa655825f6587e044a1c1c SHA256 7aa98796671dfe3db5a20e25669404c4e4461d2a6c77de352edf99f2c989e500
-DIST clamav-0.93.tar.gz 16134725 RMD160 a1f301345983ed0606e2f2e13ef63275bd341cd4 SHA1 bae5f70331e8592e9c53a04517038890845d406d SHA256 1fedc2bb4a850c962d6b0938b77b14480297bffa4cbf69ed95c4ee4f35b5db69
 DIST clamav-0.94.tar.gz 20509228 RMD160 598561b76b1e4ee14120388ba1bbdcac5ac7bfe5 SHA1 d69a0c462ac3ef55329384f8e136d9b7bc1b8ec5 SHA256 ae188c18936ea9154eb6a85ea553c29f4349ee3e95457055fae5fe1b981af602
-EBUILD clamav-0.91.2-r1.ebuild 4378 RMD160 0e6be1ff7e473b515e2362f1de934866d3fba12f SHA1 e3b13d2e1545a1d9bb37848d17f835628330f288 SHA256 adef8794ef1de7dabaf2ab1ad18886fc5a353ca2ba53dc56355846ea212c4d50
-EBUILD clamav-0.91.2.ebuild 4235 RMD160 1b50e9d66a1f75306ae8117ff8e2cb2ed86df1d4 SHA1 ba43a4bf6031fda6f254e5f56a76e663e00825ee SHA256 c0427934b1d9dfcdae76d6bfbcd3edc2ae385b18d4e33abfe9f2db45aabc55a0
-EBUILD clamav-0.92.1-r1.ebuild 4270 RMD160 b336c4e7bd8d6f4db47870acde83010b8c723b1f SHA1 45553748226c45c8d7dc4d0652c37823b31a8f3f SHA256 a87f065e3871d429b389c2ca20dfdfd4a0870de4b492d6c094f118bc5cac4a03
-EBUILD clamav-0.92.1.ebuild 4238 RMD160 984692c8f0655fc8937df0f2a43850d5e5abecfa SHA1 607c0124ff5f7a9171299bf1f447d55c14a706cf SHA256 08d2a538a130bf27ac0c06901bb7e0f3dea9335a7c2c84ebd9115808283cf0b2
-EBUILD clamav-0.92.ebuild 4109 RMD160 87289f95ba172c645c8afa967e09a6aa04fb0403 SHA1 aa06e152e7119cf6ded5aeea320d67f6e3591dee SHA256 676ed0507dcb0f743fa87027ec2daff4343d9a7ec4c1dcd08662150bc7266928
-EBUILD clamav-0.93.1.ebuild 4290 RMD160 54024f30df11a78b08e2683e82f2b818612d87b0 SHA1 28c22161126efdd813d878239e81fbf03e2609d9 SHA256 17c991141ad68190f8d813afc5e1684e2cbd0e4ea60b23ad9be91b671de55e32
 EBUILD clamav-0.93.3.ebuild 4287 RMD160 edd95891a2a9e861bf542ec4ff907e9380457839 SHA1 11d6c62cd85304d5f8674835db25046e2408af5f SHA256 08a038108585615abc0ff9592b0d57c3810bb7b01217df3b2c205bb4f6bffd92
-EBUILD clamav-0.93.ebuild 4273 RMD160 ec29f05a2f9e1ed0b18f5bb08be909fd410532ce SHA1 065ba1a4ac328b50834687020990b51ce88ab654 SHA256 0e1405745d566ca2c990e166773c13f57635ee6138dbac26027a233fea0e10f3
 EBUILD clamav-0.94.ebuild 4281 RMD160 ba93c40bdbe4c964d1719469061bde2e29cb195b SHA1 b5778d17bdbbd6d1f0a365425cfcb285ca90651a SHA256 b0a6adf98aeaa350fd4ab088cb08e9a654810c2d97a0177a2a70ad44f17b1666
-MISC ChangeLog 45563 RMD160 a65956ddc9c42233ca211fe9e6f9a167b500f919 SHA1 6d99ccf9894815c8984064664fed2aca600cc6f3 SHA256 48128f984778bfce1b3688973db63ba91b1432b0b9f5335cffe1a23ebe47e7e0
+MISC ChangeLog 45994 RMD160 27c17e5f9431bafa8421faeff0bef4bc9901a8c4 SHA1 618f99e55834e3164122d98b4fb4b3097615d350 SHA256 71de3fcfbf73364192ce2da50719d9e6375a8b322540d6762597bc5ada5a3c26
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
diff --git a/app-antivirus/clamav/clamav-0.91.2-r1.ebuild b/app-antivirus/clamav/clamav-0.91.2-r1.ebuild
deleted file mode 100644
index adab121e5af5..000000000000
--- a/app-antivirus/clamav/clamav-0.91.2-r1.ebuild
+++ /dev/null
@@ -1,143 +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/clamav/clamav-0.91.2-r1.ebuild,v 1.8 2008/02/11 22:58:32 ticho Exp $
-
-inherit autotools 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 ~x86-fbsd"
-IUSE="bzip2 crypt mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
-	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
-	epatch "${FILESDIR}"/${P}-CVE-2007-5759.patch
-	epatch "${FILESDIR}"/${P}-CVE-2007-6336.patch
-	epatch "${FILESDIR}"/${P}-CVE-2007-6337.patch
-	eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		"${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 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them to start using new version: /etc/init.d/clamd restart"
-	echo
-	ewarn "The soname for libclamav has changed after clamav-0.90."
-	ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
-	ewarn
-	ewarn "revdep-rebuild --library libclamav.so.1"
-	ewarn
-	ewarn "This will fix linking errors caused by this change."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.91.2.ebuild b/app-antivirus/clamav/clamav-0.91.2.ebuild
deleted file mode 100644
index 5bbb6455970b..000000000000
--- a/app-antivirus/clamav/clamav-0.91.2.ebuild
+++ /dev/null
@@ -1,140 +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/clamav/clamav-0.91.2.ebuild,v 1.10 2008/02/11 22:58:32 ticho Exp $
-
-inherit autotools 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 ~x86-fbsd"
-IUSE="bzip2 crypt mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
-	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
-	eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		"${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 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them to start using new version: /etc/init.d/clamd restart"
-	echo
-	ewarn "The soname for libclamav has changed after clamav-0.90."
-	ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
-	ewarn
-	ewarn "revdep-rebuild --library libclamav.so.1"
-	ewarn
-	ewarn "This will fix linking errors caused by this change."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.92.1-r1.ebuild b/app-antivirus/clamav/clamav-0.92.1-r1.ebuild
deleted file mode 100644
index 2df688d52d62..000000000000
--- a/app-antivirus/clamav/clamav-0.92.1-r1.ebuild
+++ /dev/null
@@ -1,141 +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/clamav/clamav-0.92.1-r1.ebuild,v 1.1 2008/02/29 23:46:46 ticho Exp $
-
-inherit autotools eutils flag-o-matic fixheadtails multilib
-
-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 ~x86-fbsd"
-IUSE="bzip2 crypt mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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/$(get_libdir)/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag, or mail-filter/libmilter package."
-		fi
-	fi
-
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
-	eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/freshclam.conf
-
-	if use milter ; then
-		echo "
-START_MILTER=no
-MILTER_NICELEVEL=19" \
-			>> "${D}"/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>"${D}"/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "WARNING: In 0.92.1, the logic in the scanner limits have been reworked. This"
-	ewarn "results in different command line options to clamscan, different config"
-	ewarn "options to clamd and, overall, a different behaviour."
-	echo
-	ewarn "The soname for libclamav has changed in clamav-0.92."
-	ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
-	ewarn "\trevdep-rebuild --library libclamav.so.2"
-	ewarn "This will fix linking errors caused by this change."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.92.1.ebuild b/app-antivirus/clamav/clamav-0.92.1.ebuild
deleted file mode 100644
index b03556373b2a..000000000000
--- a/app-antivirus/clamav/clamav-0.92.1.ebuild
+++ /dev/null
@@ -1,139 +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/clamav/clamav-0.92.1.ebuild,v 1.8 2008/02/23 22:37:23 ticho Exp $
-
-inherit autotools eutils flag-o-matic fixheadtails multilib
-
-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 ~x86-fbsd"
-IUSE="bzip2 crypt mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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/$(get_libdir)/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag, or mail-filter/libmilter package."
-		fi
-	fi
-
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
-	eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${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 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "WARNING: In 0.92.1, the logic in the scanner limits have been reworked. This"
-	ewarn "results in different command line options to clamscan, different config"
-	ewarn "options to clamd and, overall, a different behaviour."
-	echo
-	ewarn "The soname for libclamav has changed in clamav-0.92."
-	ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
-	ewarn "\trevdep-rebuild --library libclamav.so.2"
-	ewarn "This will fix linking errors caused by this change."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.92.ebuild b/app-antivirus/clamav/clamav-0.92.ebuild
deleted file mode 100644
index 17656e04c609..000000000000
--- a/app-antivirus/clamav/clamav-0.92.ebuild
+++ /dev/null
@@ -1,139 +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/clamav/clamav-0.92.ebuild,v 1.9 2008/02/13 10:50:06 jer Exp $
-
-inherit autotools eutils flag-o-matic fixheadtails multilib
-
-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 ~x86-fbsd"
-IUSE="bzip2 crypt mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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/$(get_libdir)/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag, or mail-filter/libmilter package."
-		fi
-	fi
-
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
-	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
-	eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		"${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 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "Warning: clamd and/or freshclam have not been restarted."
-	ewarn "You should restart them to start using new version: /etc/init.d/clamd restart"
-	echo
-	ewarn "The soname for libclamav has changed in clamav-0.92."
-	ewarn "If you have upgraded from that or earlier version, it is recommended to run:"
-	ewarn
-	ewarn "revdep-rebuild --library libclamav.so.2"
-	ewarn
-	ewarn "This will fix linking errors caused by this change."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.93.1.ebuild b/app-antivirus/clamav/clamav-0.93.1.ebuild
deleted file mode 100644
index ae901d0986eb..000000000000
--- a/app-antivirus/clamav/clamav-0.93.1.ebuild
+++ /dev/null
@@ -1,145 +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/clamav/clamav-0.93.1.ebuild,v 1.1 2008/06/11 12:58:06 falco Exp $
-
-inherit autotools eutils flag-o-matic fixheadtails multilib
-
-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 ~x86-fbsd"
-IUSE="bzip2 crypt iconv mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	iconv? ( virtual/libiconv )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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/$(get_libdir)/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag, or mail-filter/libmilter package."
-		fi
-	fi
-
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.93-buildfix.patch
-	epatch "${FILESDIR}"/${PN}-0.93-nls.patch
-
-	# If nls flag is disabled, gettext may not be available, but eautoreconf
-	# needs this file (bug #218892).
-	use nls || cp "${FILESDIR}"/lib-ld.m4 m4/
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_with iconv) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/freshclam.conf
-
-	if use milter ; then
-		echo "
-START_MILTER=no
-MILTER_NICELEVEL=19" \
-			>> "${D}"/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>"${D}"/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "The soname for libclamav has changed in clamav-0.93."
-	ewarn "If you have upgraded from that or earlier version, it is"
-	ewarn "recommended to run revdep-rebuild, in order to fix anything"
-	ewarn "that links against libclamav.so library."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.93.ebuild b/app-antivirus/clamav/clamav-0.93.ebuild
deleted file mode 100644
index 1be939ca6ccd..000000000000
--- a/app-antivirus/clamav/clamav-0.93.ebuild
+++ /dev/null
@@ -1,145 +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/clamav/clamav-0.93.ebuild,v 1.8 2008/05/11 11:35:39 dertobi123 Exp $
-
-inherit autotools eutils flag-o-matic fixheadtails multilib
-
-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 ~x86-fbsd"
-IUSE="bzip2 crypt iconv mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	iconv? ( virtual/libiconv )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=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/$(get_libdir)/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag, or mail-filter/libmilter package."
-		fi
-	fi
-
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-buildfix.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
-
-	# If nls flag is disabled, gettext may not be available, but eautoreconf
-	# needs this file (bug #218892).
-	use nls || cp "${FILESDIR}"/lib-ld.m4 m4/
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-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} \
-		$(use_enable bzip2) \
-		$(use_enable nls) \
-		$(use_with iconv) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc 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 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${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:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/freshclam.conf
-
-	if use milter ; then
-		echo "
-START_MILTER=no
-MILTER_NICELEVEL=19" \
-			>> "${D}"/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>"${D}"/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "The soname for libclamav has changed in clamav-0.93."
-	ewarn "If you have upgraded from that or earlier version, it is"
-	ewarn "recommended to run revdep-rebuild, in order to fix anything"
-	ewarn "that links against libclamav.so library."
-	echo
-}
diff --git a/app-antivirus/clamav/files/clamav-0.90-compat.patch b/app-antivirus/clamav/files/clamav-0.90-compat.patch
deleted file mode 100644
index 601e2df9a169..000000000000
--- a/app-antivirus/clamav/files/clamav-0.90-compat.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -bur clamav-0.90.orig/libclamav/clamav.h clamav-0.90/libclamav/clamav.h
---- clamav-0.90.orig/libclamav/clamav.h	2007-02-25 11:56:29.000000000 +0100
-+++ clamav-0.90/libclamav/clamav.h	2007-02-25 11:57:42.000000000 +0100
-@@ -234,6 +234,7 @@
- /* database handling */
- extern int cl_load(const char *path, struct cl_engine **engine, unsigned int *signo, unsigned int options);
- extern const char *cl_retdbdir(void);
-+extern int cl_loaddbdir(const char *dirname, struct cl_engine **engine, unsigned int *signo);
- 
- /* engine handling */
- extern int cl_build(struct cl_engine *engine);
diff --git a/app-antivirus/clamav/files/clamav-0.90-nls.patch b/app-antivirus/clamav/files/clamav-0.90-nls.patch
deleted file mode 100644
index 7349f32ea20b..000000000000
--- a/app-antivirus/clamav/files/clamav-0.90-nls.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -bur clamav-0.90.2/clamav-milter/clamav-milter.c clamav-0.90.2-nls/clamav-milter/clamav-milter.c
---- clamav-0.90.2/clamav-milter/clamav-milter.c	2007-04-12 18:35:17.000000000 +0200
-+++ clamav-0.90.2-nls/clamav-milter/clamav-milter.c	2007-04-16 15:33:40.000000000 +0200
-@@ -110,6 +110,7 @@
- 
- #ifdef	C_LINUX
- #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#ifdef	ENABLE_NLS
- #include <libintl.h>
- #include <locale.h>
- 
-@@ -122,7 +123,8 @@
- #define	_(s)	s
- #define	N_(s)	s
- 
--#endif
-+#endif /* ENABLE_NLS */
-+#endif /* C_LINUX */
- 
- #ifdef	USE_SYSLOG
- #include <syslog.h>
-@@ -664,7 +666,7 @@
- 	else
- 		progname = "clamav-milter";
- 
--#ifdef	C_LINUX
-+#ifdef	ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- 	textdomain(progname);
-diff -bur clamav-0.90.2/configure.in clamav-0.90.2-nls/configure.in
---- clamav-0.90.2/configure.in	2007-04-13 01:10:37.000000000 +0200
-+++ clamav-0.90.2-nls/configure.in	2007-04-16 15:33:40.000000000 +0200
-@@ -160,6 +160,15 @@
-     AC_CHECK_HEADER(dlfcn.h,[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ldl" ; AC_DEFINE(HAVE_NCORE,1,Support for NodalCore acceleration)], AC_MSG_WARN([****** NodalCore support disabled (no support for dlopen)]))
- fi
- 
-+AC_ARG_ENABLE(nls,
-+    AC_HELP_STRING([--disable-nls], [disable nls support]),
-+    [want_nls=$enableval], [want_nls=yes]
-+)
-+
-+if test $want_nls = yes; then
-+   CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
-+fi
-+
- AC_ARG_ENABLE(dns,
-     AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
-     [want_dns=$enableval], [want_dns=yes]
-diff -bur clamav-0.90.2/shared/getopt.c clamav-0.90.2-nls/shared/getopt.c
---- clamav-0.90.2/shared/getopt.c	2007-02-28 02:08:59.000000000 +0100
-+++ clamav-0.90.2-nls/shared/getopt.c	2007-04-16 15:33:40.000000000 +0200
-@@ -82,7 +82,7 @@
- 
- #ifndef _
- /* This is for other GNU distributions with internationalized messages.  */
--# if defined HAVE_LIBINTL_H || defined _LIBC
-+# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
- #  include <libintl.h>
- #  ifndef _
- #   define _(msgid)	gettext (msgid)
-diff -bur clamav-0.90.2/shared/output.c clamav-0.90.2-nls/shared/output.c
---- clamav-0.90.2/shared/output.c	2007-03-02 01:43:18.000000000 +0100
-+++ clamav-0.90.2-nls/shared/output.c	2007-04-16 15:33:40.000000000 +0200
-@@ -61,7 +61,7 @@
- pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if defined(C_LINUX) && defined(ENABLE_NLS)
- #include <libintl.h>
- #include <locale.h>
- 
diff --git a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-5759.patch b/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-5759.patch
deleted file mode 100644
index d879eb7f65be..000000000000
--- a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-5759.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Thu Dec  6 15:22:27 CET 2007 (tk)
----------------------------------
-  * libclamav/pe.c: fix possible integer overflow in MEW related code
-                    Reported by iDefense [IDEF2842]
-
-    Backported by <sgran@debian.org>
-
-    SVN r3376
-
-Index: clamav-0.91.2/libclamav/pe.c
-===================================================================
---- clamav-0.91.2.orig/libclamav/pe.c
-+++ clamav-0.91.2/libclamav/pe.c
-@@ -80,6 +80,18 @@
- #define PEALIGN(o,a) (((a))?(((o)/(a))*(a)):(o))
- #define PESALIGN(o,a) (((a))?(((o)/(a)+((o)%(a)!=0))*(a)):(o))
- 
-+#define CLI_UNPSIZELIMITS(NAME,CHK) \
-+if(ctx->limits && ctx->limits->maxfilesize && (CHK) > ctx->limits->maxfilesize) { \
-+    cli_dbgmsg(NAME": Sizes exceeded (%lu > %lu)\n", (CHK), ctx->limits->maxfilesize); \
-+    free(exe_sections); \
-+    if(BLOCKMAX) { \
-+        *ctx->virname = "PE."NAME".ExceededFileSize"; \
-+        return CL_VIRUS; \
-+    } else { \
-+        return CL_CLEAN; \
-+    } \
-+}
-+
- extern short cli_leavetemps_flag;
- 
- struct offset_list {
-@@ -1153,16 +1165,9 @@ int cli_scanpe(int desc, cli_ctx *ctx)
- 		dsize = exe_sections[i].vsz;
- 
- 		cli_dbgmsg("MEW: ssize %08x dsize %08x offdiff: %08x\n", ssize, dsize, offdiff);
--		if(ctx->limits && ctx->limits->maxfilesize && (ssize + dsize > ctx->limits->maxfilesize || exe_sections[i + 1].rsz > ctx->limits->maxfilesize)) {
--		    cli_dbgmsg("MEW: Sizes exceeded (ssize: %u, dsize: %u, max: %lu)\n", ssize, dsize , ctx->limits->maxfilesize);
--		    free(exe_sections);
--		    if(BLOCKMAX) {
--			*ctx->virname = "PE.MEW.ExceededFileSize";
--			return CL_VIRUS;
--		    } else {
--			return CL_CLEAN;
--		    }
--		}
-+
-+		CLI_UNPSIZELIMITS("MEW", MAX(ssize, dsize));
-+		CLI_UNPSIZELIMITS("MEW", MAX(ssize + dsize, exe_sections[i + 1].rsz));
- 
- 		/* allocate needed buffer */
- 		if (!(src = cli_calloc (ssize + dsize, sizeof(char)))) {
diff --git a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6336.patch b/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6336.patch
deleted file mode 100644
index 41cc474888c2..000000000000
--- a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6336.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Thu Dec  6 15:15:45 CET 2007 (tk)
----------------------------------
-  * libclamav/mspack.c: fix off-by-one error in LZX_READ_HUFFSYM() (bb#663)
-
-     https://wwws.clamav.net/bugzilla/show_bug.cgi?id=663
-
-     SVN r3374
-
-Index: clamav-0.91.2/libclamav/mspack.c
-===================================================================
---- clamav-0.91.2.orig/libclamav/mspack.c
-+++ clamav-0.91.2/libclamav/mspack.c
-@@ -734,7 +734,7 @@ void mszip_free(struct mszip_stream *zip
- 
- #define LZX_ENSURE_BITS(nbits)                                              \
-   while (bits_left < (nbits)) {                                         \
--    if (i_ptr >= i_end) {                                               \
-+    if (i_ptr + 1 >= i_end) {                                               \
-       if (lzx_read_input(lzx)) return lzx->error;                      \
-       i_ptr = lzx->i_ptr;                                               \
-       i_end = lzx->i_end;                                               \
diff --git a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6337.patch b/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6337.patch
deleted file mode 100644
index 71edc47c61c3..000000000000
--- a/app-antivirus/clamav/files/clamav-0.91.2-CVE-2007-6337.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Mon Dec 10 15:54:20 CET 2007 (tk)
----------------------------------
-  * libclamav/nsis/bzlib_private.h: fix bzlib bug (aCaB)
-
-    SVN r3387
-
-Index: clamav-0.91.2/libclamav/nsis/bzlib_private.h
-===================================================================
---- clamav-0.91.2.orig/libclamav/nsis/bzlib_private.h
-+++ clamav-0.91.2/libclamav/nsis/bzlib_private.h
-@@ -422,11 +422,13 @@ typedef
- /*-- Macros for decompression. --*/
- 
- #define BZ_GET_FAST(cccc)                     \
-+    if (s->tPos >= s->blockSize100k * 100000) return True; \
-     s->tPos = s->tt[s->tPos];                 \
-     cccc = (UChar)(s->tPos & 0xff);           \
-     s->tPos >>= 8;
- 
- #define BZ_GET_FAST_C(cccc)                   \
-+    if (c_tPos >= s->blockSize100k * 100000) return True; \
-     c_tPos = c_tt[c_tPos];                    \
-     cccc = (UChar)(c_tPos & 0xff);            \
-     c_tPos >>= 8;