diff --git a/app-antivirus/clamav/clamav-0.96.5.ebuild b/app-antivirus/clamav/clamav-0.97.ebuild
copy from app-antivirus/clamav/clamav-0.96.5.ebuild
copy to app-antivirus/clamav/clamav-0.97.ebuild
--- a/app-antivirus/clamav/clamav-0.96.5.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.ebuild
@@ -1,42 +1,33 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.96.ebuild,v 1.7 2010/04/17 22:21:02 maekke Exp $
+# $Header: $
 
-EAPI=2
+EAPI=3
 
-inherit eutils flag-o-matic fixheadtails multilib versionator
-
-# for when rc1 is appended to release candidates:
-MY_P=${PN}-$(replace_version_separator 3 '')
+inherit eutils flag-o-matic
 
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="bzip2 clamdtop iconv milter selinux ipv6 test"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="bzip2 clamdtop iconv ipv6 milter selinux test"
 
-COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
+CDEPEND="bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 	iconv? ( virtual/libiconv )
-	clamdtop? ( sys-libs/ncurses )
-	sys-libs/zlib
-	sys-apps/sed
+	>=sys-libs/zlib-1.2.2
 	dev-libs/libtommath"
 
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
+DEPEND="${CDEPEND}
+	>=dev-util/pkgconfig-0.20
 	test? ( dev-libs/check )"
 
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-
-PROVIDE="virtual/antivirus"
-
-S=${WORKDIR}/${MY_P}
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
 
 pkg_setup() {
 	enewgroup clamav
@@ -44,31 +35,29 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.95.1-nls.patch
+	epatch "${FILESDIR}"/${PN}-0.97-nls.patch
 }
 
 src_configure() {
-	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
-
-	ht_fix_file configure
 	econf  \
+		--disable-experimental \
+		--enable-id-check \
+		--with-dbdir=/var/lib/clamav \
 		$(use_enable bzip2) \
 		$(use_enable test check) \
+		$(use_enable clamdtop) \
 		$(use_enable ipv6) \
-		$(use_enable clamdtop) \
 		$(use_enable milter) \
 		$(use_with iconv) \
 		--with-system-tommath \
 		--without-libpdcurses-prefix \
-		--disable-experimental \
-		--enable-id-check \
-		--disable-zlib-vcheck \
-		--with-dbdir=/var/lib/clamav
+		--disable-zlib-vcheck
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ || die
+	rm -rf "${D}"/var/lib/clamav
+	dodoc AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE || die
 
 	newconfd "${FILESDIR}/clamd.conf" clamd || die
 	newinitd "${FILESDIR}/clamd.rc" clamd || die
@@ -79,12 +68,12 @@ src_install() {
 		newinitd "${FILESDIR}/clamav-milter.rc" clamav-milter || die
 	fi
 
-	keepdir /var/run/clamav || die
-	fowners clamav:clamav /var/run/clamav || die
-	keepdir /var/log/clamav || die
-	fowners clamav:clamav /var/log/clamav || die
+	for dir in lib run log; do
+		keepdir /var/${dir}/clamav || die "Can't create /var/${dir}/clamav"
+		fowners clamav:clamav /var/${dir}/clamav || die
+	done
 
-	# Modify /etc/clamd.conf to be usable out of the box
+	# Modify /etc/{clamd,freshclam}.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:" \
@@ -93,8 +82,6 @@ src_install() {
 		-e "s:^\#\(LogTime\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 		"${D}"/etc/clamd.conf || die
-
-	# 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:" \
@@ -135,13 +122,15 @@ EOF
 }
 
 pkg_postinst() {
+	ewarn
+	ewarn "Since clamav-0.97, signatures are not installed anymore. If you are"
+	ewarn "installing for the first time or upgrading from a version older"
+	ewarn "than clamav-0.97 you must download the newest signatures by"
+	ewarn "executing: /usr/bin/freshclam"
+	ewarn
+
 	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read the clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-		elog
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
 	fi
-	ewarn "The soname for libclamav has changed in clamav-0.95."
-	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."
 }