Version bump. Removed old ebuilds. Depend on either libmilter on sendmail when milter USE flag is on. Closes bug #152541, by Milan Holzäpfel <public at mjh.name>.

Package-Manager: portage-2.1.2_rc1-r1

7 files changed, 15 insertions, 376 deletions

diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index b5c62deeefd1..2d86fe23ace3 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -13,28 +13,18 @@ AUX clamd.rc 2033 RMD160 aed0e44ce893dad9da77fba3f1ee56001e99adcb SHA1 d2dc3c366
 MD5 1906bcd8209370d0a03fb066161f6d59 files/clamd.rc 2033
 RMD160 aed0e44ce893dad9da77fba3f1ee56001e99adcb files/clamd.rc 2033
 SHA256 6ccae0a0f3f7be2946ed0975ea5093dac605889c44952bd4e02f20e91e606bce files/clamd.rc 2033
-DIST clamav-0.88.2.tar.gz 6016832 RMD160 db6960b315d7c0aec289e3820363f0a6f9c41daf SHA1 6164a253b10c46ee93a821ce1fe86a167bd83cf5 SHA256 b50874f10b09ce45d6753b641836b472dd60b9e73d789fe4ec89b34f7c3d33ba
-DIST clamav-0.88.3.tar.gz 7154152 RMD160 31ec73121a07fed2aa12a839ed1595777983dc6f SHA1 5aef27bc3a73bbf6f6869c692f825b62253cbf6e SHA256 26104bca0780ed8eb99f5a08259bf09d55a374572ba1af28e661cae64da5fb84
-DIST clamav-0.88.4.tar.gz 7632947 RMD160 efa419598c7d6deae53bf9c0f40a4c2912433228 SHA1 efc343e833c0bc1c77540bdb4e8dc21cedee70fa SHA256 a581f2f7c93fac9e7a4caf5c1f15f5e7722a4739aaaa3f07dd9076e1097d157f
 DIST clamav-0.88.5.tar.gz 8663193 RMD160 b0e24b90f2a085ded89fcd90f3434d6bc1981caf SHA1 eb4c671d14d43b7079f19da9d9ef37357fa24c83 SHA256 8b807fcb64e2c523d7da8002ca1174c4173526ae48a7deecca41db30f51cee8f
+DIST clamav-0.88.6.tar.gz 8929534 RMD160 efa53c600a70a8f808fbf9cde92ebf193b76e574 SHA1 5fe6efa7c7dc9eb157a78e7851392c737d586bb7 SHA256 cc7f90983aa61b3d893c3311e3f832c5faa204467143cff597ad80bf8ad24daa
 DIST clamav-0.90RC1.1.tar.gz 8463538 RMD160 d73a44a1ab79d2a99530409c66ca6520a4c5059b SHA1 f408f1aca163a53961d2bf7eee85333e1d7b1afc SHA256 b4a2a4dc88afca53ca1452c4d2a4e6a00386cd935523f883a732464bbd898e96
 DIST clamav-0.90rc2.tar.gz 8706141 RMD160 cdf5674da401af070d6da64113d353e0d9cfdadc SHA1 915ccf0fe4a484352d5df67998cee445b3933eb2 SHA256 a74498f08d7817140036203e5247ee0b2ffa11a0be08c594a7c6444d4cb1a02a
-EBUILD clamav-0.88.2.ebuild 3406 RMD160 2f426b4c073ab8fab72e9f57602fe270b9009f1c SHA1 e83e67e98b48d945b7ba09792959020d545cce32 SHA256 eb411c993b880b0a29b0bc451d3bc22b8eda5ea6081140e4b2278ea35f5a43d2
-MD5 bf04bb1ed43db55f62385bf8977c9611 clamav-0.88.2.ebuild 3406
-RMD160 2f426b4c073ab8fab72e9f57602fe270b9009f1c clamav-0.88.2.ebuild 3406
-SHA256 eb411c993b880b0a29b0bc451d3bc22b8eda5ea6081140e4b2278ea35f5a43d2 clamav-0.88.2.ebuild 3406
-EBUILD clamav-0.88.3.ebuild 3406 RMD160 941fc203d6688294479cfabb16a0895d21b9cdfe SHA1 98a10830f18208c4f387dd24b55befa3fb426a4e SHA256 419c28c89e0b86b517616749b13ef53dd5fa7e3da31afecacaa50acf8319a109
-MD5 65c664b7aff4db54732859ce70fc03b4 clamav-0.88.3.ebuild 3406
-RMD160 941fc203d6688294479cfabb16a0895d21b9cdfe clamav-0.88.3.ebuild 3406
-SHA256 419c28c89e0b86b517616749b13ef53dd5fa7e3da31afecacaa50acf8319a109 clamav-0.88.3.ebuild 3406
-EBUILD clamav-0.88.4.ebuild 3404 RMD160 227b27df939efa8cce81d57de94607bdd95ddf02 SHA1 39db396a52c48e13b6cbf11a57e3d16be3bedadb SHA256 417d447095f3b5166b914a843d2f9479084efd89354f335a19814f3f57f0f51c
-MD5 13c77040efc7493854d5351497016535 clamav-0.88.4.ebuild 3404
-RMD160 227b27df939efa8cce81d57de94607bdd95ddf02 clamav-0.88.4.ebuild 3404
-SHA256 417d447095f3b5166b914a843d2f9479084efd89354f335a19814f3f57f0f51c clamav-0.88.4.ebuild 3404
 EBUILD clamav-0.88.5.ebuild 3405 RMD160 c3f4890abdd20b7d4083e140820fba584094b13c SHA1 025622db9bf842d37b5b4b3c6dcd5b0dbb7e5e4a SHA256 cc045a7974660ea76725bfd31091444473b92a18ccf24b4871dd41b5df810333
 MD5 c05549d893b96104e07d2be8ff5bccd7 clamav-0.88.5.ebuild 3405
 RMD160 c3f4890abdd20b7d4083e140820fba584094b13c clamav-0.88.5.ebuild 3405
 SHA256 cc045a7974660ea76725bfd31091444473b92a18ccf24b4871dd41b5df810333 clamav-0.88.5.ebuild 3405
+EBUILD clamav-0.88.6.ebuild 3435 RMD160 739df06aebb701792e13afd543d4af85c68771c3 SHA1 e9af1efd29a67ee35f1b3def3bb98091a49b4dd4 SHA256 c8695549c8d5ca2ea731f28d94ec8c99b1d874f7e00ac6b7d8fb5f9e09a06f11
+MD5 8a5a66beb8e8979481cdfb7b4d2f26ab clamav-0.88.6.ebuild 3435
+RMD160 739df06aebb701792e13afd543d4af85c68771c3 clamav-0.88.6.ebuild 3435
+SHA256 c8695549c8d5ca2ea731f28d94ec8c99b1d874f7e00ac6b7d8fb5f9e09a06f11 clamav-0.88.6.ebuild 3435
 EBUILD clamav-0.90_rc1.ebuild 3600 RMD160 ec680a7013ea787e2d43ccb316c1c41d65827244 SHA1 d76eecb58c026fb4d24d7bc7dcae11e3e5fb145c SHA256 bc76f52623de2d8e7514569da2b63f0d90efae6e5823f805f22c8e7f8684e178
 MD5 8167dff09b4f03ec6d803676ad63b63a clamav-0.90_rc1.ebuild 3600
 RMD160 ec680a7013ea787e2d43ccb316c1c41d65827244 clamav-0.90_rc1.ebuild 3600
@@ -43,26 +33,20 @@ EBUILD clamav-0.90_rc2.ebuild 3592 RMD160 d5f28da6ad030db324c45c1980878216ffe031
 MD5 ec9b4eb7bb44a0bacfee79c547abfde5 clamav-0.90_rc2.ebuild 3592
 RMD160 d5f28da6ad030db324c45c1980878216ffe0310f clamav-0.90_rc2.ebuild 3592
 SHA256 a43390128c1d70d6c44b1a6c7e627f043fe731d05ffcf6c8662cd800079b9b37 clamav-0.90_rc2.ebuild 3592
-MISC ChangeLog 27550 RMD160 39122ac439517dc7c77f2c974ca4f8a920659cd8 SHA1 8ae38a9b6b608a7154e1dd3e55ed0e5c89cf5ff2 SHA256 9853aef6a49d99e4a4c0dca93576f42348328d4f0c658f049001b4f0f542474f
-MD5 c10c04dc473b44ef5670bb59b47a8c0a ChangeLog 27550
-RMD160 39122ac439517dc7c77f2c974ca4f8a920659cd8 ChangeLog 27550
-SHA256 9853aef6a49d99e4a4c0dca93576f42348328d4f0c658f049001b4f0f542474f ChangeLog 27550
+MISC ChangeLog 27893 RMD160 a28762b8b82dfeefb7c935fc5f316a778eb2d52f SHA1 1161eda9fb2c47f2662e63e3e78a4a5e99116919 SHA256 fcb1a1afb92336efe834e3f0317e254312c48766878a36d537dccbd5a12d81f2
+MD5 fbb53e6265754eddc9a15a57319b437c ChangeLog 27893
+RMD160 a28762b8b82dfeefb7c935fc5f316a778eb2d52f ChangeLog 27893
+SHA256 fcb1a1afb92336efe834e3f0317e254312c48766878a36d537dccbd5a12d81f2 ChangeLog 27893
 MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
 MD5 7e32edfd72887a57b16ecd73f0f7a1a0 metadata.xml 184
 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 metadata.xml 184
 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58 metadata.xml 184
-MD5 6557161b98cbfbcec57b399cb594a7f4 files/digest-clamav-0.88.2 244
-RMD160 4ee5ca92b95daa1bba9ada8893b5c9e7fd0f3bce files/digest-clamav-0.88.2 244
-SHA256 4d596a1a1fa69d8a5fc8b31c63274bb4ce9184fa30c4981a005702f539715c9c files/digest-clamav-0.88.2 244
-MD5 e99ea9753b8e03fdc8a1992f139603d0 files/digest-clamav-0.88.3 244
-RMD160 4dd0a59a5e59d12b17b88424e7079328f6298ff1 files/digest-clamav-0.88.3 244
-SHA256 73e6ebe5b51e27e33c25dfc7e57690ced65ce0a17e0191fb8d4aec52ce210e6b files/digest-clamav-0.88.3 244
-MD5 b8104a2c3ee03cdf67dcaea1553abdb8 files/digest-clamav-0.88.4 244
-RMD160 9c38dbaf56e49c8614caeeb4bf9c78126f4096c1 files/digest-clamav-0.88.4 244
-SHA256 677d57d8903d1262b92cc90f2421664f58716950cfbe7e5b95109d0914f66910 files/digest-clamav-0.88.4 244
 MD5 771923a686a6485a06d9bb833dec9872 files/digest-clamav-0.88.5 244
 RMD160 cac3e56638adf1fbb9f9d356d0ac724e2c877b7f files/digest-clamav-0.88.5 244
 SHA256 9bd80aa793fa0b018d41141f9c7efbde27989b3ecac741723b2ab3e3f641e719 files/digest-clamav-0.88.5 244
+MD5 f9759ea151bfa3a383ad5fc55e6cb4bc files/digest-clamav-0.88.6 244
+RMD160 673d71e776b5d06aa8d54cd86ea3302ca70b5136 files/digest-clamav-0.88.6 244
+SHA256 68ed32f50d9252b826a618a0b2f5d55d8655b480059ae039bddcd5f0e2f37b57 files/digest-clamav-0.88.6 244
 MD5 fa7e303f8f99e4693beb43a0a2b0e0b9 files/digest-clamav-0.90_rc1 253
 RMD160 ee5645616db2626c6cf87c99f2ea0177f5a4c149 files/digest-clamav-0.90_rc1 253
 SHA256 68559c554b8fc8afa9ea0d2b7c3f5db41d19cdf15a8d115d6d83fa27aede0d74 files/digest-clamav-0.90_rc1 253
@@ -72,7 +56,7 @@ SHA256 c0187965a68f4423a6d8937f911dde49a724751f436f51741c150f4ac5ee16b6 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRqHVQlM6RnzZP+IRAjRaAKCa7MnPLpMFrsKYE7ZWetNHFeHqnwCgoVVx
-HTLVPWU6M1NfubjfT27wTaE=
-=suEN
+iD8DBQFFTkRCQlM6RnzZP+IRAuueAKCuScwP3g4Ygol5TbWwTeVnczPyyACgmPTv
+6jQmHci5AiQWbuw732RmxsU=
+=CrdI
 -----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.88.2.ebuild b/app-antivirus/clamav/clamav-0.88.2.ebuild
deleted file mode 100644
index bd12a7e3543e..000000000000
--- a/app-antivirus/clamav/clamav-0.88.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.2.ebuild,v 1.9 2006/05/31 12:59:28 plasmaroo 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
-	>=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_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 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 --timeout=0\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	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.88.3.ebuild b/app-antivirus/clamav/clamav-0.88.3.ebuild
deleted file mode 100644
index d8200cef9181..000000000000
--- a/app-antivirus/clamav/clamav-0.88.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.3.ebuild,v 1.6 2006/08/06 02:09:31 nigoro 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
-	>=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_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 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 --timeout=0\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	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.88.4.ebuild b/app-antivirus/clamav/clamav-0.88.4.ebuild
deleted file mode 100644
index d518ff3ef979..000000000000
--- a/app-antivirus/clamav/clamav-0.88.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.4.ebuild,v 1.10 2006/09/02 22:41:01 kloeri 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
-	>=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_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 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 --timeout=0\"" \
-			>>${D}/etc/conf.d/clamd
-	fi
-}
-
-pkg_postinst() {
-	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.88.2 b/app-antivirus/clamav/files/digest-clamav-0.88.2
deleted file mode 100644
index 0e5049125bdc..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.88.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz 6016832
-RMD160 db6960b315d7c0aec289e3820363f0a6f9c41daf clamav-0.88.2.tar.gz 6016832
-SHA256 b50874f10b09ce45d6753b641836b472dd60b9e73d789fe4ec89b34f7c3d33ba clamav-0.88.2.tar.gz 6016832
diff --git a/app-antivirus/clamav/files/digest-clamav-0.88.3 b/app-antivirus/clamav/files/digest-clamav-0.88.3
deleted file mode 100644
index a2aa829ee5f8..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.88.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz 7154152
-RMD160 31ec73121a07fed2aa12a839ed1595777983dc6f clamav-0.88.3.tar.gz 7154152
-SHA256 26104bca0780ed8eb99f5a08259bf09d55a374572ba1af28e661cae64da5fb84 clamav-0.88.3.tar.gz 7154152
diff --git a/app-antivirus/clamav/files/digest-clamav-0.88.4 b/app-antivirus/clamav/files/digest-clamav-0.88.4
deleted file mode 100644
index a5b2f0480d00..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.88.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz 7632947
-RMD160 efa419598c7d6deae53bf9c0f40a4c2912433228 clamav-0.88.4.tar.gz 7632947
-SHA256 a581f2f7c93fac9e7a4caf5c1f15f5e7722a4739aaaa3f07dd9076e1097d157f clamav-0.88.4.tar.gz 7632947