diff --git a/app-antivirus/clamav/clamav-0.95.2.ebuild b/app-antivirus/clamav/clamav-0.95.3.ebuild
copy from app-antivirus/clamav/clamav-0.95.2.ebuild
copy to app-antivirus/clamav/clamav-0.95.3.ebuild
--- a/app-antivirus/clamav/clamav-0.95.2.ebuild
+++ b/app-antivirus/clamav/clamav-0.95.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.2.ebuild,v 1.5 2009/06/27 14:15:58 ranger Exp $
 
@@ -8,8 +8,7 @@ inherit eutils flag-o-matic fixheadtails
 
 # for when rc1 is appended to release candidates:
 MY_PV=$(replace_version_separator 3 '');
-MY_P="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
@@ -17,19 +16,19 @@ SRC_URI="mirror://sourceforge/${PN}/${MY
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="bzip2 clamdtop iconv milter selinux ipv6 test"
 
 COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 	iconv? ( virtual/libiconv )
 	clamdtop? ( sys-libs/ncurses )
-	>=sys-libs/zlib-1.2.1-r3
-	>=sys-apps/sed-4
+	sys-libs/zlib
+	sys-apps/sed
 	dev-libs/libtommath"
 
 DEPEND="${COMMON_DEPEND}
-	>=dev-util/pkgconfig-0.20
+	dev-util/pkgconfig
 	test? ( dev-libs/check )"
 
 RDEPEND="${COMMON_DEPEND}
@@ -38,13 +37,15 @@ RDEPEND="${COMMON_DEPEND}
 
 PROVIDE="virtual/antivirus"
 
+S=${WORKDIR}/${MY_P}
+
 pkg_setup() {
 	enewgroup clamav
 	enewuser clamav -1 -1 /dev/null clamav
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.95.1-nls.patch"
+	epatch "${FILESDIR}"/${PN}-0.95.1-nls.patch
 }
 
 src_configure() {
@@ -53,36 +54,36 @@ src_configure() {
 	ht_fix_file configure
 	econf  \
 		$(use_enable bzip2) \
+		$(use_enable test check) \
 		$(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 || die
+		--with-dbdir=/var/lib/clamav
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
+	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ || die
 
-	newconfd "${FILESDIR}/clamd.conf" clamd
-	newinitd "${FILESDIR}/clamd.rc" clamd
-	newconfd "${FILESDIR}/freshclam.conf" freshclam
-	newinitd "${FILESDIR}/freshclam.rc" freshclam
+	newconfd "${FILESDIR}/clamd.conf" clamd || die
+	newinitd "${FILESDIR}/clamd.rc" clamd || die
+	newconfd "${FILESDIR}/freshclam.conf" freshclam || die
+	newinitd "${FILESDIR}/freshclam.rc" freshclam || die
 	if use milter; then
-		newconfd "${FILESDIR}/clamav-milter.conf" clamav-milter
-		newinitd "${FILESDIR}/clamav-milter.rc" clamav-milter
+		newconfd "${FILESDIR}/clamav-milter.conf" clamav-milter || die
+		newinitd "${FILESDIR}/clamav-milter.rc" clamav-milter || die
 	fi
 
-	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
+	keepdir /var/run/clamav || die
+	fowners clamav:clamav /var/run/clamav || die
+	keepdir /var/log/clamav || die
+	fowners clamav:clamav /var/log/clamav || die
 
 	# Modify /etc/clamd.conf to be usable out of the box
 	sed -i -e "s:^\(Example\):\# \1:" \
@@ -92,7 +93,7 @@ src_install() {
 		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
 		-e "s:^\#\(LogTime\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/clamd.conf
+		"${D}"/etc/clamd.conf || die
 
 	# Do the same for /etc/freshclam.conf
 	sed -i -e "s:^\(Example\):\# \1:" \
@@ -102,13 +103,13 @@ src_install() {
 		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
 		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/freshclam.conf
+		"${D}"/etc/freshclam.conf || die
 
 	if use milter; then
 		# And again same for /etc/clamav-milter.conf
 		# MilterSocket one to include ' /' because there is a 2nd line for
 		# inet: which we want to leave
-		dodoc "${FILESDIR}/clamav-milter.README.gentoo"
+		dodoc "${FILESDIR}"/clamav-milter.README.gentoo || die
 
 		sed -i -e "s:^\(Example\):\# \1:" \
 			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
@@ -117,21 +118,21 @@ src_install() {
 			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
 			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
-			"${D}"/etc/clamav-milter.conf
+			"${D}"/etc/clamav-milter.conf || die
 	fi
 
 	if use milter ; then
-		cat << EOF >> "${D}"/etc/conf.d/clamd
+		cat << EOF >> "${D}"/etc/conf.d/clamd || die
 MILTER_NICELEVEL=19
 START_MILTER=no
 EOF
 	fi
 
 	diropts ""
-	dodir /etc/logrotate.d
+	dodir /etc/logrotate.d || die
 	insopts -m0644
 	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+	newins "${FILESDIR}"/${PN}.logrotate ${PN} || die
 }
 
 pkg_postinst() {