Stable on ppc, removed old versions, changed to virtual/qmail.

(Portage version: 2.1_pre4-r1)

12 files changed, 15 insertions, 761 deletions

diff --git a/mail-filter/qmail-scanner/ChangeLog b/mail-filter/qmail-scanner/ChangeLog
index 3aeee71b665f..c03cea5ec634 100644
--- a/mail-filter/qmail-scanner/ChangeLog
+++ b/mail-filter/qmail-scanner/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-filter/qmail-scanner
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.30 2006/02/13 14:42:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/ChangeLog,v 1.31 2006/02/20 22:36:18 hansmi Exp $
+
+  20 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
+  -qmail-scanner-1.16-r2.ebuild, -qmail-scanner-1.23-r2.ebuild,
+  -qmail-scanner-1.23-r3.ebuild, -qmail-scanner-1.24.ebuild,
+  -qmail-scanner-1.25.ebuild, qmail-scanner-1.25-r1.ebuild:
+  Stable on ppc, removed old versions, changed to virtual/qmail.
+
+  20 Feb 2006; Michael Hanselmann <hansmi@gentoo.org>
+  qmail-scanner-1.25-r1.ebuild:
+  Stable on ppc.
 
   13 Feb 2006; Michael Cummings <mcummings@gentoo.org>
   qmail-scanner-1.16-r2.ebuild, qmail-scanner-1.23-r2.ebuild,
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16-r2 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16-r2
deleted file mode 100644
index 8cd551a81271..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.16-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 37b89fc12ef602886fe2bed7a2551309 qmail-scanner-1.16.tgz 117703
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r2 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r2
deleted file mode 100644
index 16efe6198934..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d16e912b89126b2d957f86bf78d52be5 qmail-scanner-1.23.tgz 153107
-MD5 b8ad9c2258108dd47c548de201943410 q-s-1.23st-20040817.patch.gz 86595
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r3 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r3
deleted file mode 100644
index 562c61d4c188..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.23-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d16e912b89126b2d957f86bf78d52be5 qmail-scanner-1.23.tgz 153107
-MD5 24bf487a3d41eff4c4d36455785819e6 q-s-1.23st-20040819.patch.gz 86633
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.24 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.24
deleted file mode 100644
index 8782b9254bcb..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.24
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0281b721b059e09c8470982d26e4ccb0 qmail-scanner-1.24.tgz 197398
-MD5 5f4b18334906c60bce40b2dd1c4d8b11 q-s-1.24st-20041101.patch.gz 90889
diff --git a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.25 b/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.25
deleted file mode 100644
index eee315131002..000000000000
--- a/mail-filter/qmail-scanner/files/digest-qmail-scanner-1.25
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0117c425efb75208682fabcba4e1dd24 qmail-scanner-1.25.tgz 221156
-MD5 1efe7769bb88eaf551ebb18c6316ca6a q-s-1.25st-20050207.patch.gz 118044
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild
deleted file mode 100644
index a525333e5077..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.16-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2006 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.16-r2.ebuild,v 1.6 2006/02/13 14:42:56 mcummings Exp $
-
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz"
-
-DEPEND=">=dev-lang/perl-5.6.1-r1
-	>=virtual/perl-Time-HiRes-01.20-r2
-	>=net-mail/tnef-1.1.1
-	>=mail-filter/maildrop-1.3.9
-	>=virtual/perl-DB_File-1.803-r2
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=app-arch/unzip-5.42-r1
-	virtual/antivirus"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-IUSE=""
-
-inherit fixheadtails
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	ht_fix_file autoupdaters/update_macafee autoupdaters/update_trend autoupdaters/update_sophos configure
-}
-
-src_compile () {
-	yes | PATH=${PATH}:/opt/f-prot:/opt/vlnx ./configure \
-		--domain localhost \
-			|| die "./configure failed!"
-}
-
-src_install () {
-	# Create Directory Structure
-	diropts -m 755 -o qmailq -g qmail
-	dodir /var/spool/qmailscan
-	keepdir /var/spool/qmailscan
-	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
-
-	# Install standard quarantine attachments file
-	insinto /var/spool/qmailscan
-	insopts -m 644 -o qmailq -g qmail
-	doins quarantine-attachments.txt
-
-	# Install qmail-scanner script
-	insinto /var/qmail/bin
-	insopts -m 4755 -o qmailq -g qmail
-	doins qmail-scanner-queue.pl
-
-	# Install documentation
-	dodoc README CHANGES COPYING
-	dohtml README.html
-
-	# Install the contribs
-	docinto contrib
-	cd ${S}/contrib
-	dodoc spamc-nice.eml
-	dodoc test-clamd.pl
-	dodoc test-trophie.pl
-	dodoc sub-avpdaemon.pl
-	dodoc logging_first_80_chars.eml
-	dodoc spamc-nasty.eml
-	dodoc avpdeamon.init
-	dodoc test_installation.sh
-	dodoc sub-sender-cache.pl
-	dodoc test-sophie.pl
-	dodoc reformime-test.eml
-}
-
-pkg_postinst () {
-	# Setup perlscanner + Version Info
-	/var/qmail/bin/qmail-scanner-queue.pl -z
-	/var/qmail/bin/qmail-scanner-queue.pl -g
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue.pl"
-}
-
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild
deleted file mode 100644
index 0337a41500b2..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.23-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 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.23-r2.ebuild,v 1.8 2006/02/13 14:42:56 mcummings Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20040817
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc ~ppc"
-
-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
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=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`
-		einfo "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
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject yes --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 COPYING
-	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
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "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-1.23-r3.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild
deleted file mode 100644
index d9ab43d334c4..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.23-r3.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 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.23-r3.ebuild,v 1.9 2006/02/13 14:42:56 mcummings Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20040819
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-
-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
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=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`
-		einfo "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
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject yes --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 COPYING
-	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
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "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-1.24.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild
deleted file mode 100644
index fc2997f671fd..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.24.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2006 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.24.ebuild,v 1.7 2006/02/13 14:42:56 mcummings Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20041101
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-
-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
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=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`
-		einfo "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
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	einfo "Adding items to the SILENT_VIRUSES list (${EXTRA_VIRII})"
-	sed -e "/^SILENT_VIRUSES/s/\"$/,${EXTRA_VIRII}\"/g"  -i configure
-}
-
-src_compile () {
-	local myconf
-	use spamassassin && myconf="--virus-to-delete yes --sa-quarantine 2.1 --sa-delete 4.2 --sa-reject yes --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 COPYING
-	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
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "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-1.25-r1.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild
index 4837580c02d7..db1140332042 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-2006 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.9 2006/02/13 14:42:56 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/qmail-scanner/qmail-scanner-1.25-r1.ebuild,v 1.10 2006/02/20 22:36:18 hansmi Exp $
 
 inherit fixheadtails toolchain-funcs eutils
 
@@ -14,7 +14,7 @@ IUSE="spamassassin"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 RESTRICT="userpriv usersandbox"
 
 DEPEND=">=dev-lang/perl-5.6.1-r1
@@ -22,11 +22,7 @@ DEPEND=">=dev-lang/perl-5.6.1-r1
 	>=net-mail/tnef-1.1.1
 	>=virtual/perl-DB_File-1.803-r2
 	>=net-mail/ripmime-1.3.0.4
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
+	virtual/qmail
 	>=app-arch/unzip-5.42-r1
 	virtual/antivirus
 	spamassassin? ( >=mail-filter/spamassassin-2.64 )"
@@ -76,7 +72,7 @@ src_compile () {
 
 	# 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
+	$(tc-getCC) ${CFLAGS} -o qmail-scanner-queue qmail-scanner-queue.c || die
 }
 
 src_install () {
diff --git a/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild b/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild
deleted file mode 100644
index f60852f00ba5..000000000000
--- a/mail-filter/qmail-scanner/qmail-scanner-1.25.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.8 2006/02/13 14:42:56 mcummings Exp $
-
-inherit fixheadtails toolchain-funcs eutils
-
-Q_S_DATE=20050207
-DESCRIPTION="E-Mail virus scanner for qmail."
-HOMEPAGE="http://qmail-scanner.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmail-scanner/${P}.tgz
-		http://xoomer.virgilio.it/j.toribio/qmail-scanner/download/q-s-${PV}st-${Q_S_DATE}.patch.gz"
-
-IUSE="spamassassin"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc ~amd64"
-
-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
-	|| (
-	>=mail-mta/qmail-1.03-r8
-	>=mail-mta/qmail-ldap-1.03-r1
-	  mail-mta/qmail-mysql
-	)
-	>=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`
-		einfo "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
-
-	EXTRA_VIRII="bagle,beagle,mydoom,sco,maldal,mimail,novarg,shimg,bugler,cissi,cissy,dloade,netsky,qizy"
-	einfo "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
-
-	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 COPYING
-	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
-
-	einfo "To activate qmail-scanner, please edit your"
-	einfo "/var/qmail/control/conf-common file and set:"
-	einfo "export QMAILQUEUE=/var/qmail/bin/qmail-scanner-queue"
-	einfo "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"
-}