virtual/antivirus removed from dependency. Bug #265905

(Portage version: 2.1.6.7/cvs/Linux x86_64)

6 files changed, 18 insertions, 544 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index f4e0e5f9882e..390071aef6ad 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/qmail-scanner
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.49 2009/03/20 13:00:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.50 2009/04/14 09:30:09 tupone Exp $
+
+  14 Apr 2009; Alfredo Tupone <tupone@gentoo.org>
+  qmail-scanner-1.25-r1.ebuild, -qmail-scanner-2.01.ebuild,
+  -qmail-scanner-2.01-r1.ebuild, -qmail-scanner-2.02-r1.ebuild,
+  qmail-scanner-2.05.ebuild:
+  virtual/antivirus removed from dependency. Bug #265905 by <py@gentoo.org>
+  old unstable versions removed
 
   20 Mar 2009; Joseph Jezak <josejx@gentoo.org> qmail-scanner-2.05.ebuild:
   Marked ~ppc for bug #249893.
@@ -61,9 +68,9 @@
   bug #151801 by Michail Baikov
   bug #135636 by Peter Gantner (a.k.a. nephros)
   Adding instruction to make clamav working with qmail-scanner:
-  bug #73001 by David Röhr <david@rohr.se>
+  bug #73001 by David Röhr <david@rohr.se>
 
-  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   qmail-scanner-1.25-r1.ebuild, qmail-scanner-2.01.ebuild:
   (QA) RESTRICT clean up.
 
@@ -71,7 +78,7 @@
   qmail-scanner-1.25-r1.ebuild, qmail-scanner-2.01.ebuild:
   Replacing einfo with elog
 
-  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
+  22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
 
   20 Jul 2006; Michael Sterrett <mr_bones_@gentoo.org>
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
index b057cdb1c6e6..2dc2218cbcd5 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild,v 1.15 2008/12/05 08:06:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild,v 1.16 2009/04/14 09:30:09 tupone Exp $
 
 inherit fixheadtails toolchain-funcs eutils
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
 RESTRICT="userpriv"
 
-DEPEND=">=dev-lang/perl-5.6.1-r1
+RDEPEND=">=dev-lang/perl-5.6.1-r1
 	>=virtual/perl-Time-HiRes-01.20-r2
 	>=net-mail/tnef-1.1.1
 	>=virtual/perl-DB_File-1.803-r2
@@ -26,6 +26,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 	>=app-arch/unzip-5.42-r1
 	virtual/antivirus
 	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	enewgroup qscand 210
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild
deleted file mode 100644
index ffa82bf5b1a6..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.01-r1.ebuild,v 1.2 2008/10/29 20:17:44 tupone Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20070204
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="userpriv"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=virtual/perl-Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=virtual/perl-DB_File-1.803-r2
-	net-mail/ripmime
-	virtual/qmail
-	>=app-arch/unzip-5.42-r1
-	virtual/antivirus
-	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qscan qscand
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm index.php && cp README.html index.php
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	ht_fix_file autoupdaters/* configure
-	sed -i \
-		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
-		README-st-patch.html \
-		README-st-patch.txt || die "Fixing doc with sed failed"
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qscan
-	keepdir /var/spool/qscan
-	diropts -m 750 -o qscand -g qscand
-	dodir /var/spool/qscan/quarantine
-	for i in quarantine/{viruses,policy,spam} working archives; do
-		for j in tmp new cur; do
-			dodir /var/spool/qscan/${i}/${j}
-			keepdir /var/spool/qscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qscan/tmp
-	keepdir /var/spool/qscan/tmp
-
-	# Install standard quarantine events file
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-events.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/${P}.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml
-	dodoc test-trophie.pl
-	dodoc logrotate.qmailscanner
-	dodoc sub-avpdaemon.pl
-	dodoc logging_first_80_chars.eml
-	dodoc spamc-nasty.eml
-	dodoc avpdeamon.init
-	dodoc test_installation.sh
-	dodoc test-sophie.pl
-	dodoc reformime-test.eml
-	dodoc sub-sender-cache.pl
-	dodoc rbl_scanner.txt
-	dodoc test-clamd.pl
-	dodoc qs2mrtg.pl
-	dodoc mrtg-qmail-scanner.cfg
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qscan
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-
-	ewarn "If this is an upgrade from <=2.0.1 the home directory of the qscand"
-	ewarn "user is changed. Please update it manually to /var/spool/qscan"
-	ewarn "or remove the user and emerge again this package"
-
-	ewarn "For an integration with clamav, clamav user should have access"
-	ewarn "to files in the qscand group."
-	ewarn "To allow that, add clamav user to the qscand group and"
-	ewarn "comment-out in /etc/clamd.conf AllowSupplementaryGroups putting yes."
-	ewarn "After that, restart clamd with"
-	ewarn "/etc/init.d/clamd restart"
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild
deleted file mode 100644
index 6f985386ad21..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.01.ebuild,v 1.7 2008/12/05 08:06:31 tupone Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20060423
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="userpriv"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=virtual/perl-Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=virtual/perl-DB_File-1.803-r2
-	>=net-mail/ripmime-1.3.0.4
-	virtual/qmail
-	>=app-arch/unzip-5.42-r1
-	virtual/antivirus
-	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qmailscan qscand
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	rm index.php && cp README.html index.php
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	ht_fix_file autoupdaters/* configure
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--mime-unpacker "ripmime" \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	diropts -m 750 -o qscand -g qscand
-	for i in quarantine working archive; do
-		for j in tmp new cur; do
-			dodir /var/spool/qmailscan/${i}/${j}
-			keepdir /var/spool/qmailscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qmailscan/tmp
-	keepdir /var/spool/qmailscan/tmp
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-attachments.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qmailscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/qmailscanner.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml
-	dodoc test-trophie.pl
-	dodoc logrotate.qmailscanner
-	dodoc sub-avpdaemon.pl
-	dodoc logging_first_80_chars.eml
-	dodoc spamc-nasty.eml
-	dodoc avpdeamon.init
-	dodoc test_installation.sh
-	dodoc test-sophie.pl
-	dodoc reformime-test.eml
-	dodoc sub-sender-cache.pl
-	dodoc rbl_scanner.txt
-	dodoc test-clamd.pl
-	dodoc qs2mrtg.pl
-	dodoc mrtg-qmail-scanner.cfg
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qmailscan/tmp /var/spool/qmailscan/working /var/spool/qmailscan/quarantine* /var/spool/qmailscan/archive /var/spool/qmailscan/qmail*
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
deleted file mode 100644
index 979e7cc3c044..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.02-r1.ebuild,v 1.3 2008/10/30 05:47:08 tupone Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20080119
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://toribio.apollinare.org/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="clamav spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="userpriv"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=virtual/perl-Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=virtual/perl-DB_File-1.803-r2
-	mail-filter/maildrop
-	virtual/qmail
-	>=app-arch/unzip-5.42-r1
-	sys-process/daemontools
-	virtual/antivirus
-	clamav? ( app-antivirus/clamav )
-	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
-
-pkg_setup() {
-	enewgroup qscand 210
-	enewuser qscand 210 -1 /var/spool/qscan qscand
-	use clamav && usermod -a -G qscand,nofiles clamav
-}
-
-pkg_preinst() {
-	local oldname="/var/qmail/bin/qmail-scanner-queue.pl"
-	if [ -f ${oldname} ]; then
-		newname=${oldname}.`date +%Y%m%d%H%M%S`
-		elog "Backing up old qmail-scanner as $newname in case of modifications."
-		cp ${oldname} ${newname}
-		chmod 600 ${newname}
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${DISTDIR}"/q-s-${PV}st-${Q_S_DATE}.patch.gz
-	ht_fix_file autoupdaters/* configure
-	sed -i \
-		-e "s:/var/spool/qscand:/var/spool/qscan:g" \
-		README-st-patch.html \
-		README-st-patch.txt || die "Fixing doc with sed failed"
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	elog "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-
-	addpredict /var/log/kav/kavscan.log
-	addpredict /opt/bdc/plugins.htm
-
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject no --sa-subject SPAM: --sa-delta 0.5 --sa-alt yes"
-
-	PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-	--domain localhost \
-	--batch \
-	--log-details yes \
-	--skip-setuid-test \
-	${myconf} \
-	|| die "./configure failed!"
-
-	# build for qmail-scanner-queue wrapper, so we don't need suidperl
-	cd contrib
-	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qscand -g qscand
-	dodir /var/spool/qscan
-	keepdir /var/spool/qscan
-	diropts -m 750 -o qscand -g qscand
-	dodir /var/spool/qscan/quarantine
-	for i in quarantine/{viruses,policy,spam} working archives; do
-		for j in tmp new cur; do
-			dodir /var/spool/qscan/${i}/${j}
-			keepdir /var/spool/qscan/${i}/${j}
-		done
-	done
-	dodir /var/spool/qscan/tmp
-	keepdir /var/spool/qscan/tmp
-
-	# Install standard quarantine events file
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine-events.txt
-
-	# create quarantine.log and viruses.log
-	touch quarantine.log
-	insinto /var/spool/qscan
-	insopts -m 644 -o qscand -g qscand
-	doins quarantine.log
-	dosym quarantine.log ${DESTDIR}/var/spool/qscan/viruses.log
-
-	# Install qmail-scanner wrapper
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qscand -g qscand
-	doins contrib/qmail-scanner-queue
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 0755 -o qscand -g qscand
-	doins qmail-scanner-queue.pl
-
-	insinto /etc/logrotate.d/
-	insopts -m 644 -o root -g root
-	newins "${FILESDIR}"/${P}.logrotate qmail-scanner
-
-	exeinto /etc/cron.daily/
-	newexe "${FILESDIR}"/qmailscanner.cronjob qmail-scanner
-
-	# Install documentation
-	dodoc README CHANGES
-	dohtml README.html FAQ.php TODO.php configure-options.php manual-install.php perlscanner.php
-
-	docinto contrib
-	cd "${S}"/contrib
-	dodoc spamc-nice.eml \
-		test-trophie.pl \
-		logrotate.qmail-scanner \
-		sub-avpdaemon.pl \
-		logging_first_80_chars.eml \
-		spamc-nasty.eml \
-		avpdeamon.init \
-		test_installation.sh \
-		test-sophie.pl \
-		reformime-test.eml \
-		sub-sender-cache.pl \
-		rbl_scanner.txt \
-		test-clamd.pl \
-		qs2mrtg.pl \
-		mrtg-qmail-scanner.cfg \
-		check_AV_daemons \
-		patch_for_nod32_single_user.eml \
-		qmail-delay \
-		qs-scanner-report.sh \
-		qs_config.sh \
-		qscan-spam-to-users.pl \
-		test-avgd.pl \
-		test_password.zip \
-		vpopmail-issues.eml
-}
-
-pkg_postinst () {
-	einfo "Fixing ownerships"
-	chown -R qscand:qscand /var/spool/qscan
-	touch /var/qmail/bin/qmail-scanner-queue.pl
-
-	# Setup perlscanner + Version Info
-	chmod -s "${ROOT}"/var/qmail/bin/qmail-scanner-queue.pl
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -z
-	"${ROOT}"/var/qmail/bin/qmail-scanner-queue -g
-
-	elog "To activate qmail-scanner, please edit your"
-	elog "/var/qmail/control/conf-common file and set:"
-	elog "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	elog "Or place it in your tcprules file."
-	ewarn "Please note that it was a call to qmail-scanner-queue.pl before,"
-	ewarn "but this is now changed to use a wrapper to improve security!"
-	ewarn "Once you have changed to the wrapper, you can remove the setuid "
-	ewarn "bit on qmail-scanner-queue.pl"
-
-	ewarn "If this is an upgrade from <=2.0.1 the home directory of the qscand"
-	ewarn "user is changed. Please update it manually to /var/spool/qscan"
-	ewarn "or remove the user and emerge again this package"
-
-	if use clamav; then
-		ewarn "To allow clamav integration comment-out in /etc/clamd.conf:"
-		ewarn "AllowSupplementaryGroups putting yes."
-		ewarn "After that, restart clamd with"
-		ewarn "/etc/init.d/clamd restart"
-	fi
-}
diff --git a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
index 70f23d53aca1..901e561064ef 100644
--- a/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
+++ b/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild,v 1.4 2009/03/20 13:00:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-2.05.ebuild,v 1.5 2009/04/14 09:30:09 tupone Exp $
 
 inherit fixheadtails toolchain-funcs eutils
 
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
 RESTRICT="userpriv"
 
-DEPEND="dev-lang/perl
+RDEPEND="dev-lang/perl
 	virtual/perl-Time-HiRes
 	net-mail/tnef
 	virtual/perl-DB_File
@@ -25,9 +25,9 @@ DEPEND="dev-lang/perl
 	virtual/qmail
 	app-arch/unzip
 	sys-process/daemontools
-	virtual/antivirus
 	clamav? ( app-antivirus/clamav )
 	spamassassin? ( mail-filter/spamassassin )"
+DEPEND="${RDEPEND}"
 
 pkg_setup() {
 	enewgroup qscand 210