Version bump. Removed obsolete ebuilds.

Package-Manager: portage-2.1.3_rc8

19 files changed, 38 insertions, 1034 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index fece81856a44..db29a74298be 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.245 2007/07/17 06:13:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.246 2007/08/21 09:17:29 ticho Exp $
+
+*clamav-0.91.2 (21 Aug 2007)
+
+  21 Aug 2007; Andrej Kacian <ticho@gentoo.org> -clamav-0.88.7.ebuild,
+  -clamav-0.88.7-r1.ebuild, -clamav-0.88.7-r2.ebuild, -clamav-0.90.ebuild,
+  -clamav-0.90.1.ebuild, -clamav-0.90.1-r1.ebuild, -clamav-0.90.2.ebuild,
+  -clamav-0.90.3.ebuild, +clamav-0.91.2.ebuild:
+  Version bump. Removed obsolete ebuilds.
 
   17 Jul 2007; Jeroen Roovers <jer@gentoo.org> clamav-0.91.ebuild:
   Stable for HPPA (bug #185013).
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 603c2cea2c0e..2ecd41fad78e 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX clamav-0.90-compat.patch 585 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 SHA1 fedfe373a6a911230c553fd5a095c8acb72b4ce2 SHA256 7a646386f74bc9094bd39d6762b78ef74310678cdef5484650e0aa242cf570e9
 MD5 6c50cdabc6ee6dc40df2b89c075380a5 files/clamav-0.90-compat.patch 585
 RMD160 3ee74f163bd8b4440f06773ec7abe3bcec1fff79 files/clamav-0.90-compat.patch 585
@@ -22,88 +25,42 @@ AUX clamd.rc 3565 RMD160 704da4f51a69f01524ca68ebe379736c9b0597ce SHA1 d087a49aa
 MD5 5f886e0001a0f76405ad7ae2bcad239f files/clamd.rc 3565
 RMD160 704da4f51a69f01524ca68ebe379736c9b0597ce files/clamd.rc 3565
 SHA256 50ca2c25f796bb3554b5aa08f9e1bbe043ced62f58f2295f6cf33403d7c23dd8 files/clamd.rc 3565
-DIST clamav-0.88.7.tar.gz 9510548 RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 SHA1 7d7833dc454437ed7044b1c734f0a13e4dc1ead2 SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2
-DIST clamav-0.90.1.tar.gz 11643310 RMD160 1fd343d6510fea337a676e32bb1e4e404da4bd6d SHA1 d51f279fce2d702c3e97b2e08fe3b4b863f0acc6 SHA256 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be
-DIST clamav-0.90.2.tar.gz 12062886 RMD160 22daaecb634ca9914f18e85cf3456b544d6bf399 SHA1 ecc72d212a27eef1aa40e61a0b2705e4e42996ce SHA256 30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa
-DIST clamav-0.90.3.tar.gz 12496857 RMD160 7dda3541afee8403c7fb98aa827f14b5a7a1d6ce SHA1 ec322b5ada9cf5b6faebd2d800985545ee2d28fa SHA256 939913d15ad0dc583ba609274ae61a948f4fa18b848bd503d958feacdaab54a4
-DIST clamav-0.90.tar.gz 11575374 RMD160 1b22144d3a41376093b73bbeb5302092a18ca685 SHA1 574b84429b878df3a9d862ea386c970326850158 SHA256 c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d
 DIST clamav-0.91.1.tar.gz 13099119 RMD160 a9b1526d11264d55e3ac38b7c16d27db43bf8a4e SHA1 51ff98325b5ffd49dfc0f0cbf92134c0d872cd21 SHA256 f98edecae40473c142fe49a0e02f5ff7fb28d778c4bd510dad747d208d20cb00
+DIST clamav-0.91.2.tar.gz 13394538 RMD160 9e181a7a4fd08377ff47663aed27f8cc97249a21 SHA1 f18007c3045a1d78967adad805c6934d46ca6419 SHA256 dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0
 DIST clamav-0.91.tar.gz 13026634 RMD160 192acbe2fa290030df2fd60c7f323b434acc7a69 SHA1 995e054d19250777597c504552310490a59d8f76 SHA256 329ad13ae12390d3758017297e307ca06744bfb4e3fb61424b4f064faf5a2bbb
-EBUILD clamav-0.88.7-r1.ebuild 3794 RMD160 b3b7a19109bcb762b68468b43a5843e31e9d5304 SHA1 4086fd3a2f0a5b398b3bcf7209d69ed45f654fb1 SHA256 17f88d324fe6de67a95591d9ecb667f1cb235e1cf0d7bfce20d7f9e2652fc1c0
-MD5 e12ef0ba40f91ef851685fdfabae8a77 clamav-0.88.7-r1.ebuild 3794
-RMD160 b3b7a19109bcb762b68468b43a5843e31e9d5304 clamav-0.88.7-r1.ebuild 3794
-SHA256 17f88d324fe6de67a95591d9ecb667f1cb235e1cf0d7bfce20d7f9e2652fc1c0 clamav-0.88.7-r1.ebuild 3794
-EBUILD clamav-0.88.7-r2.ebuild 3995 RMD160 577d570a78afce113f9296be239762e8ccdbe33d SHA1 8528bdbf82499491996da22e1b3c884f9337e1ad SHA256 693af82b661f287fc7cbae94c9ceb353ca60a786b35349f2e1b6ca5da17b7400
-MD5 8036b037347953157e2907b2d216359b clamav-0.88.7-r2.ebuild 3995
-RMD160 577d570a78afce113f9296be239762e8ccdbe33d clamav-0.88.7-r2.ebuild 3995
-SHA256 693af82b661f287fc7cbae94c9ceb353ca60a786b35349f2e1b6ca5da17b7400 clamav-0.88.7-r2.ebuild 3995
-EBUILD clamav-0.88.7.ebuild 3423 RMD160 37baf0f06949ffcc6a888b781a48aeabe3645603 SHA1 95ee653fd9e9388c8bbe5a935298e1b52dd01b69 SHA256 132368196b4588b1299c6effe1de5d509a1f03fe8468470914310aba0f4b1aa5
-MD5 15d0b7b3fc2520514a2a1ebbb8b523f7 clamav-0.88.7.ebuild 3423
-RMD160 37baf0f06949ffcc6a888b781a48aeabe3645603 clamav-0.88.7.ebuild 3423
-SHA256 132368196b4588b1299c6effe1de5d509a1f03fe8468470914310aba0f4b1aa5 clamav-0.88.7.ebuild 3423
-EBUILD clamav-0.90.1-r1.ebuild 4369 RMD160 c20419a7558ff6c708cdcb15f8940e6dd0e2fba8 SHA1 862359b3f13e4e713b79f76b708b0e7de5150ec0 SHA256 6a8b57616cd7c9849fbcf81c30a0b24a011c68ddfa0720ba08e828c2758dbd47
-MD5 f201c1be3ee362d64d7a8fb38268e79c clamav-0.90.1-r1.ebuild 4369
-RMD160 c20419a7558ff6c708cdcb15f8940e6dd0e2fba8 clamav-0.90.1-r1.ebuild 4369
-SHA256 6a8b57616cd7c9849fbcf81c30a0b24a011c68ddfa0720ba08e828c2758dbd47 clamav-0.90.1-r1.ebuild 4369
-EBUILD clamav-0.90.1.ebuild 4249 RMD160 862af63e89d38f1a148595cd8887e4431194cf67 SHA1 9aaa656c5aae07997173b89c675717caf70f9520 SHA256 c2c4cd6230918c13cafcd7ab816ad1fe4ba91509bc5fb94fe83944323aca4fd2
-MD5 e3fbe0859df4a5f9f554fa173834fdb4 clamav-0.90.1.ebuild 4249
-RMD160 862af63e89d38f1a148595cd8887e4431194cf67 clamav-0.90.1.ebuild 4249
-SHA256 c2c4cd6230918c13cafcd7ab816ad1fe4ba91509bc5fb94fe83944323aca4fd2 clamav-0.90.1.ebuild 4249
-EBUILD clamav-0.90.2.ebuild 4360 RMD160 08dc92531b2f1e20928f8cafa42faae1086c06a0 SHA1 4ede69d04eb05851b26af5819f58208be1fc799b SHA256 329bb34a7b1a0b237353ebcecee7492d192064372bd41918412c0e945b6e7e7a
-MD5 fd255610f158ff057e2e92d0ff9d195c clamav-0.90.2.ebuild 4360
-RMD160 08dc92531b2f1e20928f8cafa42faae1086c06a0 clamav-0.90.2.ebuild 4360
-SHA256 329bb34a7b1a0b237353ebcecee7492d192064372bd41918412c0e945b6e7e7a clamav-0.90.2.ebuild 4360
-EBUILD clamav-0.90.3.ebuild 4361 RMD160 e05735db07b6095dc469d24a711b979f29cb098b SHA1 6867cfa92cf24701e692fcc366bb597f6bc18a8c SHA256 88ba261a5ac0a51a59a686b16a0f719f166a2b158b5706e6a13681174d649346
-MD5 549ef7e552d555a6c0d4c66cb6320438 clamav-0.90.3.ebuild 4361
-RMD160 e05735db07b6095dc469d24a711b979f29cb098b clamav-0.90.3.ebuild 4361
-SHA256 88ba261a5ac0a51a59a686b16a0f719f166a2b158b5706e6a13681174d649346 clamav-0.90.3.ebuild 4361
-EBUILD clamav-0.90.ebuild 3958 RMD160 acabf30bc728a8edc824d14d7e965b858b324340 SHA1 071353cfdbfdd72c7ce8bdf70bfcb0d1248f700c SHA256 ec400f0e7387af9362c5ee2d77cb686a227634f9caf638be381f2094e43b6ace
-MD5 1a6bb4a7e8d417feff74b768aaa216e9 clamav-0.90.ebuild 3958
-RMD160 acabf30bc728a8edc824d14d7e965b858b324340 clamav-0.90.ebuild 3958
-SHA256 ec400f0e7387af9362c5ee2d77cb686a227634f9caf638be381f2094e43b6ace clamav-0.90.ebuild 3958
 EBUILD clamav-0.91.1.ebuild 4304 RMD160 9e4dadde02fd55773c1b459951fdd7f716eb406b SHA1 c51c05f714800982523006064ea99a38afa11c8a SHA256 1e315215fcf5a94cd823e45cc9764cf500779dbe59961e21a6a27a9803493c5c
 MD5 1eeddcbb72ce535c226cdc6ba72d2c07 clamav-0.91.1.ebuild 4304
 RMD160 9e4dadde02fd55773c1b459951fdd7f716eb406b clamav-0.91.1.ebuild 4304
 SHA256 1e315215fcf5a94cd823e45cc9764cf500779dbe59961e21a6a27a9803493c5c clamav-0.91.1.ebuild 4304
+EBUILD clamav-0.91.2.ebuild 4304 RMD160 2fa59dca2e4d17f0118cfb9c0ae8ef7b2f238c7e SHA1 631d6da3bb8c4b5968ed316062f8816711dc451b SHA256 697e78c478d6494b45f0796bc9ffed2b5626b8c0b53009dd00de6f0264cc9d4e
+MD5 4a4fd25502f59e46a341e398b2ff2e0c clamav-0.91.2.ebuild 4304
+RMD160 2fa59dca2e4d17f0118cfb9c0ae8ef7b2f238c7e clamav-0.91.2.ebuild 4304
+SHA256 697e78c478d6494b45f0796bc9ffed2b5626b8c0b53009dd00de6f0264cc9d4e clamav-0.91.2.ebuild 4304
 EBUILD clamav-0.91.ebuild 4292 RMD160 2c91464c0a27cf56bb78bf81110c1c90ec01fb9c SHA1 d6b6400ffd867691f6363fbd973f834e10a311b8 SHA256 a75fe69369b5f2fa357c9d4f3cffdb8465ee4fbc2104370dde20d5ccba71dd2a
 MD5 6c7ea16d7cedbd9a85db797d7a1adba2 clamav-0.91.ebuild 4292
 RMD160 2c91464c0a27cf56bb78bf81110c1c90ec01fb9c clamav-0.91.ebuild 4292
 SHA256 a75fe69369b5f2fa357c9d4f3cffdb8465ee4fbc2104370dde20d5ccba71dd2a clamav-0.91.ebuild 4292
-MISC ChangeLog 37971 RMD160 a699a83a98ae7e92f43ac5e48968ba74036356ff SHA1 f9725c48c45c3411df3b903082661ba665007063 SHA256 db605609d8cde29fe823f95b60c46477a50bbeedd1a6bfe59efedf60788d4f83
-MD5 06a4bba230b2fa29fef45744380131b5 ChangeLog 37971
-RMD160 a699a83a98ae7e92f43ac5e48968ba74036356ff ChangeLog 37971
-SHA256 db605609d8cde29fe823f95b60c46477a50bbeedd1a6bfe59efedf60788d4f83 ChangeLog 37971
+MISC ChangeLog 38314 RMD160 8353c60cfe27de9efe767d24605720919b1cf780 SHA1 1bbf13b85a649387c86056504b439e6c782118b9 SHA256 348dcf1cba78dca38a893a71406930bcb8d40bbc8b70783265a72d7321633501
+MD5 66da6bed096faa788459b4f80422858f ChangeLog 38314
+RMD160 8353c60cfe27de9efe767d24605720919b1cf780 ChangeLog 38314
+SHA256 348dcf1cba78dca38a893a71406930bcb8d40bbc8b70783265a72d7321633501 ChangeLog 38314
 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 bccf90d7043a4dcf5e63ebfb791fba03 files/digest-clamav-0.88.7 244
-RMD160 5da87304d411960a91d80f102be4c2d4937479b6 files/digest-clamav-0.88.7 244
-SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/digest-clamav-0.88.7 244
-MD5 bccf90d7043a4dcf5e63ebfb791fba03 files/digest-clamav-0.88.7-r1 244
-RMD160 5da87304d411960a91d80f102be4c2d4937479b6 files/digest-clamav-0.88.7-r1 244
-SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/digest-clamav-0.88.7-r1 244
-MD5 bccf90d7043a4dcf5e63ebfb791fba03 files/digest-clamav-0.88.7-r2 244
-RMD160 5da87304d411960a91d80f102be4c2d4937479b6 files/digest-clamav-0.88.7-r2 244
-SHA256 2e2d87de95403702c16fdcf253ab8f6faaec955053a2eabd917b097e50322d9e files/digest-clamav-0.88.7-r2 244
-MD5 86c5fb07d5e490ef03e5b7837181c66d files/digest-clamav-0.90 241
-RMD160 50f0394e921a2e5b445a7202757943ef14680ac5 files/digest-clamav-0.90 241
-SHA256 9efe02b7f40c318f512bed0e5ddc59d52834a088a0528102ee8ece709ff5966e files/digest-clamav-0.90 241
-MD5 2990615ce8ce0c303dc772558ee52ea4 files/digest-clamav-0.90.1 247
-RMD160 be0e20cdadaa82a58211c754908e439923513e21 files/digest-clamav-0.90.1 247
-SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/digest-clamav-0.90.1 247
-MD5 2990615ce8ce0c303dc772558ee52ea4 files/digest-clamav-0.90.1-r1 247
-RMD160 be0e20cdadaa82a58211c754908e439923513e21 files/digest-clamav-0.90.1-r1 247
-SHA256 be92b57874b8c81e9831142039d6ee58ab3aaf3feae75d26a4a5d1d821a21757 files/digest-clamav-0.90.1-r1 247
-MD5 a51cf8bdb107839a6a251af7ca543e74 files/digest-clamav-0.90.2 247
-RMD160 07dc65c177668ad15f01334d6476c7c8358d60f9 files/digest-clamav-0.90.2 247
-SHA256 e68c7b04a6e584aec2663aec7d1fb258ddf06e21554f0dd71bc9fec76ed12a20 files/digest-clamav-0.90.2 247
-MD5 0f14f6f92ab17734cf7d3795625da674 files/digest-clamav-0.90.3 247
-RMD160 9b5ecf89ab497b044c41232892e929b32cc15cc8 files/digest-clamav-0.90.3 247
-SHA256 74c2590b88a1c3e1d1b3372b5f3a6236ccf303e9e23009fd3795f25223c2d6de files/digest-clamav-0.90.3 247
 MD5 cf331ee5043d2667587d2d5f8207214f files/digest-clamav-0.91 241
 RMD160 b9ca05ab7e5455ea0049d3781364665601eb2cd1 files/digest-clamav-0.91 241
 SHA256 005e0f558c95292331bd1ecc52559ab3ede5ec481ab32fc15717cdfb2143d269 files/digest-clamav-0.91 241
 MD5 957debe430d48ffb27ac17aa6189dab4 files/digest-clamav-0.91.1 247
 RMD160 423825904509af07b3afdbd6e291433dfb7efe77 files/digest-clamav-0.91.1 247
 SHA256 a548eaceeae74311a6c0121e128ef89dbcf3636b7113c0090afdb5cece703983 files/digest-clamav-0.91.1 247
+MD5 00ade3fd37049fda2aee0672a43d7e66 files/digest-clamav-0.91.2 247
+RMD160 168d12eabacf3f4fc8158e74d23def1ab63031d7 files/digest-clamav-0.91.2 247
+SHA256 af7a808342703688323e4b3cf3d3fbdecd73ec0cfca98e80a50cdcfa259214fb files/digest-clamav-0.91.2 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGyq20QlM6RnzZP+IRAhseAJ928FwlZxbjSn7Nzivjhs3d7kgPbgCfYSOs
+d6bwjvbFfw/LU+gq9f9+nnU=
+=Pw2u
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.88.7-r1.ebuild b/app-antivirus/clamav/clamav-0.88.7-r1.ebuild
deleted file mode 100644
index 464bbce56ee9..000000000000
--- a/app-antivirus/clamav/clamav-0.88.7-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.7-r1.ebuild,v 1.5 2007/01/23 15:22:40 genone 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 ~x86-fbsd"
-IUSE="crypt milter selinux mailwrapper onaccess"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	onaccess? ( sys-fs/dazuko )
-	>=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
-	if use onaccess ; then
-		echo
-		ewarn "Warning: On access scan support is experimental!"
-		echo
-	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} \
-		$(use_enable onaccess clamuko) \
-		--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
-
-	if use onaccess ; then
-		dodir /etc/udev/rules.d
-		echo "KERNEL==\"dazuko\", NAME=\"%k\", GROUP=\"clamav\", MODE=\"0660\"" \
-			>${D}/etc/udev/rules.d/60-dazuko.rules
-	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
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.88.7-r2.ebuild b/app-antivirus/clamav/clamav-0.88.7-r2.ebuild
deleted file mode 100644
index 6a208b102713..000000000000
--- a/app-antivirus/clamav/clamav-0.88.7-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.7-r2.ebuild,v 1.2 2007/01/23 15:22:40 genone 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 ~x86-fbsd"
-IUSE="crypt logrotate mailwrapper milter onaccess selinux"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	onaccess? ( sys-fs/dazuko )
-	>=sys-libs/zlib-1.2.1-r3
-	>=net-misc/curl-7.10.0
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	logrotate? ( app-admin/logrotate )
-	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
-	if use onaccess ; then
-		echo
-		ewarn "Warning: On access scan support is experimental!"
-		echo
-	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} \
-		$(use_enable onaccess clamuko) \
-		--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
-
-	if use onaccess ; then
-		dodir /etc/udev/rules.d
-		echo "KERNEL==\"dazuko\", NAME=\"%k\", GROUP=\"clamav\", MODE=\"0660\"" \
-			>${D}/etc/udev/rules.d/60-dazuko.rules
-	fi
-
-	if use logrotate ; then
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/${PN}.logrotate ${PN}
-	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
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.88.7.ebuild b/app-antivirus/clamav/clamav-0.88.7.ebuild
deleted file mode 100644
index f1b3c9cb1bd4..000000000000
--- a/app-antivirus/clamav/clamav-0.88.7.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.88.7.ebuild,v 1.7 2007/03/20 12:04:20 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 ~x86-fbsd"
-IUSE="crypt milter selinux mailwrapper"
-
-DEPEND="virtual/libc
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	milter? ( || ( mail-filter/libmilter 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
-	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
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.90.1.ebuild b/app-antivirus/clamav/clamav-0.90.1.ebuild
deleted file mode 100644
index 91fb23b88e72..000000000000
--- a/app-antivirus/clamav/clamav-0.90.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.1.ebuild,v 1.4 2007/03/20 12:04:20 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 ~x86-fbsd"
-IUSE="bzip2 crypt curl logrotate mailwrapper milter selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	curl? ( >=net-misc/curl-7.10.0 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	logrotate? ( app-admin/logrotate )
-	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}"/${P%.*}-compat.patch
-}
-
-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_with curl libcurl) \
-		--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
-
-	if use logrotate ; then
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/${PN}.logrotate ${PN}
-	fi
-}
-
-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.90.2.ebuild b/app-antivirus/clamav/clamav-0.90.2.ebuild
deleted file mode 100644
index 5dc18c7426ca..000000000000
--- a/app-antivirus/clamav/clamav-0.90.2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.2.ebuild,v 1.8 2007/04/15 19:20:25 corsair 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 curl logrotate mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	curl? ( >=net-misc/curl-7.10.0 )
-	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 )
-	logrotate? ( app-admin/logrotate )
-	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}"/${P%.*}-compat.patch
-	epatch "${FILESDIR}"/${P%.*}-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_with curl libcurl) \
-		$(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
-
-	if use logrotate ; then
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/${PN}.logrotate ${PN}
-	fi
-}
-
-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.90.3.ebuild b/app-antivirus/clamav/clamav-0.90.3.ebuild
deleted file mode 100644
index bf8a300ea95c..000000000000
--- a/app-antivirus/clamav/clamav-0.90.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.3.ebuild,v 1.7 2007/06/04 12:34:20 gustavoz 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 curl logrotate mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	curl? ( >=net-misc/curl-7.10.0 )
-	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 )
-	logrotate? ( app-admin/logrotate )
-	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}"/${P%.*}-compat.patch
-	epatch "${FILESDIR}"/${P%.*}-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_with curl libcurl) \
-		$(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
-
-	if use logrotate ; then
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/${PN}.logrotate ${PN}
-	fi
-}
-
-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.90.ebuild b/app-antivirus/clamav/clamav-0.90.ebuild
deleted file mode 100644
index 9afe88612b37..000000000000
--- a/app-antivirus/clamav/clamav-0.90.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.ebuild,v 1.13 2007/03/28 18:17:38 armin76 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 ~x86-fbsd"
-IUSE="bzip2 crypt curl logrotate mailwrapper milter selinux"
-
-DEPEND="virtual/libc
-	bzip2? ( app-arch/bzip2 )
-	crypt? ( >=dev-libs/gmp-4.1.2 )
-	curl? ( >=net-misc/curl-7.10.0 )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/gmp
-	>=sys-libs/zlib-1.2.1-r3
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	logrotate? ( app-admin/logrotate )
-	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}"/${P}-compat.patch
-}
-
-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_with curl libcurl) \
-		--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
-
-	if use logrotate ; then
-		diropts ""
-		dodir /etc/logrotate.d
-		insopts -m0644
-		insinto /etc/logrotate.d
-		newins ${FILESDIR}/${PN}.logrotate ${PN}
-	fi
-}
-
-pkg_postinst() {
-	echo
-	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
-	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
-}
diff --git a/app-antivirus/clamav/clamav-0.90.1-r1.ebuild b/app-antivirus/clamav/clamav-0.91.2.ebuild
index 0ff28945f533..976a15fc006e 100644
--- a/app-antivirus/clamav/clamav-0.90.1-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.91.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.90.1-r1.ebuild,v 1.5 2007/03/20 12:04:20 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild,v 1.1 2007/08/21 09:17:29 ticho Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails
 
@@ -11,12 +11,11 @@ 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 curl logrotate mailwrapper milter nls selinux"
+IUSE="bzip2 crypt logrotate mailwrapper milter nls selinux"
 
 DEPEND="virtual/libc
 	bzip2? ( app-arch/bzip2 )
 	crypt? ( >=dev-libs/gmp-4.1.2 )
-	curl? ( >=net-misc/curl-7.10.0 )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 	nls? ( sys-devel/gettext )
 	dev-libs/gmp
@@ -44,8 +43,8 @@ pkg_setup() {
 src_unpack() {
 	unpack "${A}"
 	cd "${S}"
-	epatch "${FILESDIR}"/${P%.*}-compat.patch
-	epatch "${FILESDIR}"/${P%.*}-nls.patch
+	epatch "${FILESDIR}"/${PN}-0.90-compat.patch
+	epatch "${FILESDIR}"/${PN}-0.90-nls.patch
 	eautoreconf
 }
 
@@ -68,7 +67,6 @@ src_compile() {
 	ht_fix_file configure
 	econf ${myconf} \
 		$(use_enable bzip2) \
-		$(use_with curl libcurl) \
 		$(use_enable nls) \
 		--disable-experimental \
 		--with-dbdir=/var/lib/clamav || die
diff --git a/app-antivirus/clamav/files/digest-clamav-0.88.7 b/app-antivirus/clamav/files/digest-clamav-0.88.7
deleted file mode 100644
index 766a04de5f01..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.88.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz 9510548
-RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 clamav-0.88.7.tar.gz 9510548
-SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2 clamav-0.88.7.tar.gz 9510548
diff --git a/app-antivirus/clamav/files/digest-clamav-0.88.7-r1 b/app-antivirus/clamav/files/digest-clamav-0.88.7-r1
deleted file mode 100644
index 766a04de5f01..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.88.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz 9510548
-RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 clamav-0.88.7.tar.gz 9510548
-SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2 clamav-0.88.7.tar.gz 9510548
diff --git a/app-antivirus/clamav/files/digest-clamav-0.88.7-r2 b/app-antivirus/clamav/files/digest-clamav-0.88.7-r2
deleted file mode 100644
index 766a04de5f01..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.88.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz 9510548
-RMD160 14d7c6255df618b16b704fc1cb5ce2b1385fa0e8 clamav-0.88.7.tar.gz 9510548
-SHA256 702cb5928bff3d0e647a4a6b505d434e3a0f10f2af74bddac5239a200b92d1e2 clamav-0.88.7.tar.gz 9510548
diff --git a/app-antivirus/clamav/files/digest-clamav-0.90 b/app-antivirus/clamav/files/digest-clamav-0.90
deleted file mode 100644
index e4c17f0e55f9..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.90
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz 11575374
-RMD160 1b22144d3a41376093b73bbeb5302092a18ca685 clamav-0.90.tar.gz 11575374
-SHA256 c39005318d4a7d27d9710c3d71396b8c500e0bc5a184cb7392051c9ca9dea60d clamav-0.90.tar.gz 11575374
diff --git a/app-antivirus/clamav/files/digest-clamav-0.90.1 b/app-antivirus/clamav/files/digest-clamav-0.90.1
deleted file mode 100644
index fe2fc17efcc2..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.90.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz 11643310
-RMD160 1fd343d6510fea337a676e32bb1e4e404da4bd6d clamav-0.90.1.tar.gz 11643310
-SHA256 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be clamav-0.90.1.tar.gz 11643310
diff --git a/app-antivirus/clamav/files/digest-clamav-0.90.1-r1 b/app-antivirus/clamav/files/digest-clamav-0.90.1-r1
deleted file mode 100644
index fe2fc17efcc2..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.90.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz 11643310
-RMD160 1fd343d6510fea337a676e32bb1e4e404da4bd6d clamav-0.90.1.tar.gz 11643310
-SHA256 08a0255b4f6bdc4312eea6c118e79ecf684aed10640b45037d9dc5890c7687be clamav-0.90.1.tar.gz 11643310
diff --git a/app-antivirus/clamav/files/digest-clamav-0.90.2 b/app-antivirus/clamav/files/digest-clamav-0.90.2
deleted file mode 100644
index 41faa351398b..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.90.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz 12062886
-RMD160 22daaecb634ca9914f18e85cf3456b544d6bf399 clamav-0.90.2.tar.gz 12062886
-SHA256 30df6a5d4a591dcd4acd7d4cce54dcfd260280fce6bbc9d19d240967bcdabbfa clamav-0.90.2.tar.gz 12062886
diff --git a/app-antivirus/clamav/files/digest-clamav-0.90.3 b/app-antivirus/clamav/files/digest-clamav-0.90.3
deleted file mode 100644
index 2160c6a8f2fd..000000000000
--- a/app-antivirus/clamav/files/digest-clamav-0.90.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz 12496857
-RMD160 7dda3541afee8403c7fb98aa827f14b5a7a1d6ce clamav-0.90.3.tar.gz 12496857
-SHA256 939913d15ad0dc583ba609274ae61a948f4fa18b848bd503d958feacdaab54a4 clamav-0.90.3.tar.gz 12496857
diff --git a/app-antivirus/clamav/files/digest-clamav-0.91.2 b/app-antivirus/clamav/files/digest-clamav-0.91.2
new file mode 100644
index 000000000000..dff507b523df
--- /dev/null
+++ b/app-antivirus/clamav/files/digest-clamav-0.91.2
@@ -0,0 +1,3 @@
+MD5 2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz 13394538
+RMD160 9e181a7a4fd08377ff47663aed27f8cc97249a21 clamav-0.91.2.tar.gz 13394538
+SHA256 dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0 clamav-0.91.2.tar.gz 13394538