virtual/antivirus removed from dependency. Bug #265905

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

7 files changed, 21 insertions, 555 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/Manifest b/mail-filter/qmail-scanner/Manifest
index c0e6d4cf9dd2..e6715675306b 100644
--- a/mail-filter/qmail-scanner/Manifest
+++ b/mail-filter/qmail-scanner/Manifest
@@ -5,18 +5,10 @@ AUX qmail-scanner-queue.pl.patch 240 RMD160 6d644003bb6386ad2e21e775352fe01bf8cc
 AUX qmailscanner.cronjob 50 RMD160 afec02a08f7824fbea506b14372af9ea62270b8a SHA1 773b938347d27a042537cd925543fdde732231a2 SHA256 09354f2ef42b6423a5947d004a4d3bf76355aafaf11a0db12052bf088115dee1
 AUX qmailscanner.logrotate 147 RMD160 d4eccf7f1169a448c0ce8115f426214927935385 SHA1 d3f763ed9dd1ba8a9c41837e5110950c14b40591 SHA256 eae732e0be2ace1ddcd4cc17a9c6a54012684c76dd30faa5349d394f3befc62f
 DIST q-s-1.25st-20050406.patch.gz 124325 RMD160 162f325c0d77deaca4f49f06bf4cb6b6e0b548f5 SHA1 fb1b516b4ace278a1834a264690a1e1927ded530 SHA256 a758b902150f432cc0fa0cc76448bf975e75395ab6b614ca1d8f3be64ab6535a
-DIST q-s-2.01st-20060423.patch.gz 99463 RMD160 e395948089886cdd79c40e6a9c59a1048b0dbe49 SHA1 e5b4d3483484fd36efa847beede68e6a7389449f SHA256 b6f507dc0f199aff798f6189c1af6f337d859c7d1eb1af5e44539d45864f367c
-DIST q-s-2.01st-20070204.patch.gz 90410 RMD160 da89d1233d63e0a4bd462721df295e973e398def SHA1 2aa3ef010ccc0f7fd5f99cf6b1d477334a34d87a SHA256 d8d2db13a17de228acb9e0b403ac7930a5488ee64a7d72d37e3feddf7b243cac
-DIST q-s-2.02st-20080119.patch.gz 101067 RMD160 820dea7bba37de3002ebe7d8087ffa035c88aaec SHA1 9929369479dbbb610118c233e210fb73ce1c4eac SHA256 265eea06510f2af88bca413cd7f25b9449d2a41bcec63500887ab775492d33b3
 DIST q-s-2.05st-20080728.patch.gz 102235 RMD160 6983d3481fe3163d2e833e04d2c34132f22cbe05 SHA1 b403abe1b8dccb1038a83a16c411e0e62e1f7880 SHA256 03f6b5c030fcd95a726b15b68ce722495b73cea406356fe00a51f0f52c0aa840
 DIST qmail-scanner-1.25.tgz 221156 RMD160 404feea1291ff4f40d7041f112ed86352735a88f SHA1 d8bf1b968eaec64309404f3253e513e1ae6d5cac SHA256 6fa5743a0d180bc4d1a626c4bf56c06a29ec3c0d7cb2ce834add8faceefb9c01
-DIST qmail-scanner-2.01.tgz 226699 RMD160 77ed1ca024b99b30cd6973faf6595c71f85eaf5b SHA1 7ac4de517c9fc66b1ea058e1d15d7ab52ca12ad0 SHA256 4bf69d3581c23b552deffafcfca49f325c5fe6c5ee6012055f201b8535243472
-DIST qmail-scanner-2.02.tgz 236440 RMD160 49a8b3465546071e6ff07a6faa8059f11e185a45 SHA1 1173fb993d46eed50089d71fa3824eace89a07c3 SHA256 50b7d0d7b6caabc0e58fd62f7f4483b89fc528a7f78cfd795f40c0f0825fae03
 DIST qmail-scanner-2.05.tgz 237577 RMD160 15119ae1d7163d414258403834c325907a4984b3 SHA1 86423f3f37853374ecdcb6e672dc55c01945752c SHA256 add5d19669838ea8d2fa414051b4d12d1eacba54a0d8a93b7af4c886cd9f6697
-EBUILD qmail-scanner-1.25-r1.ebuild 4952 RMD160 8198881272942a545e92a40009f22b3eba62f8b5 SHA1 d4fc9d8c26ce9b25b70e52ed3363f8755cbe036b SHA256 d826034553884e95a5e353158c8face0d169541aed970420bdb170dbf172809d
-EBUILD qmail-scanner-2.01-r1.ebuild 5526 RMD160 868b8034aa36946d378bbd7a21b3abe87a19c384 SHA1 a43f7ba448db10b4b702440e54c5e8c9d731692a SHA256 edd16606b9b2fdf4598311288e94d344479bc0cf98faa0fe2fc1510dc9d82eed
-EBUILD qmail-scanner-2.01.ebuild 4982 RMD160 3234d81e547aa4531c44cfeaa66e5fbe64e59c0d SHA1 b4815ce0b4e78675669574c7b43796f02716a153 SHA256 0c948f79c9244ea9dfc5094a4a9544e96fe06636f209f7682bb92fc162e33813
-EBUILD qmail-scanner-2.02-r1.ebuild 5632 RMD160 cbabf1318cd227c4884a592c93bc8aed6de8d5cc SHA1 1c51dea925b129a4c1122235b0aa4c48204b9d69 SHA256 14374fe320b3d55d32c515055cb03a67366ed9b0b86483eeb6d441fedb66d929
-EBUILD qmail-scanner-2.05.ebuild 5581 RMD160 1a60da62f73bb98382df01385f913b0f54bd6699 SHA1 bac702e92411e140d0b89898f87259f37eb8d315 SHA256 1e6429a3974d8474e7952862f360f39f450cb45428a02b9b75bcbb370b8faad2
-MISC ChangeLog 10986 RMD160 46448b74d6193202b966d0651b2fb8a2bd4a3f82 SHA1 82b3d7dbc0a8cd04986b48f78941d03c4e65f848 SHA256 8f3165ef3d772a546ad1366fe3224d6497931dc92d516312056394225adbbb56
+EBUILD qmail-scanner-1.25-r1.ebuild 4973 RMD160 ecbc10a6526914658bede8764244f16dcbc5abbb SHA1 5e6789b505eac4a24c8bda64fb3a820834cd0f2b SHA256 95fa3a9f8276b39ebff3f16e6e4f522d45103a712661583743a6035b26ef3645
+EBUILD qmail-scanner-2.05.ebuild 5583 RMD160 c62e3c4177a8e88f40cf57b72300d9d15344622d SHA1 a7d39cf110ed3c66db1efbe7348db4a59b5bacbc SHA256 d19660a0c5c41bad30af734a1f388124408de3396ee78245ce16cab0ab7616a4
+MISC ChangeLog 11304 RMD160 5ed1f39eb3d0a6e21db572fb181fdcd7d46d1fab SHA1 e6c1bfa22ac57ef323939c57a65a4ecbe2091d2c SHA256 e98de7a3708e62b90b13ef8050492472a2c6ca519df258cbf198a0eb4d60887f
 MISC metadata.xml 282 RMD160 6047a02ca8e523b09e783bbe055f9f7cb62b0016 SHA1 4569f60d2043a11bf769109750076c03327b26e5 SHA256 48e16cc43d5cf9869e871f9779e3188fbb3321a16a119c19e5f8d7cdf08649bd
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