cleanup ebuild, fix bug #33211, and update postinst docs

4 files changed, 83 insertions, 3 deletions

diff --git a/net-mail/qmail-scanner/ChangeLog b/net-mail/qmail-scanner/ChangeLog
index 465e44922fd1..01bd917ae458 100644
--- a/net-mail/qmail-scanner/ChangeLog
+++ b/net-mail/qmail-scanner/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/qmail-scanner
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/ChangeLog,v 1.9 2003/04/19 23:18:35 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/ChangeLog,v 1.10 2003/11/29 04:11:49 robbat2 Exp $
+
+*qmail-scanner-1.16-r2 (28 Nov 2003)
+
+  28 Nov 2003; Robin H. Johnson <robbat2@gentoo.org>
+  qmail-scanner-1.16-r2.ebuild:
+  cleanup ebuild, fix bug #33211, and update postinst docs
 
 *qmail-scanner-1.16-r1 (19 Apr 2003)
 
diff --git a/net-mail/qmail-scanner/Manifest b/net-mail/qmail-scanner/Manifest
index 1d16197d663a..9bc7f7037126 100644
--- a/net-mail/qmail-scanner/Manifest
+++ b/net-mail/qmail-scanner/Manifest
@@ -1,7 +1,7 @@
 MD5 9b415da22f5b0bf38baa3fb54096039c qmail-scanner-1.16.ebuild 2572
 MD5 1d2a4d79ed5478270dc51de57040ac17 qmail-scanner-1.16-r1.ebuild 2580
-MD5 8e10287f7d6271ec4886390cac94bf52 qmail-scanner-1.16-r2.ebuild 1962
-MD5 b91e006d50342160b1234eadcfec05b3 ChangeLog 1494
+MD5 1eeba122344e7bd28ee0ce4e4c026e8f qmail-scanner-1.16-r2.ebuild 1961
+MD5 5b653cba8f1648976f69302a29d09075 ChangeLog 1681
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16 67
 MD5 21cbccfc2015bf74d509a5b329ef4b30 files/digest-qmail-scanner-1.16-r1 67
diff --git a/net-mail/qmail-scanner/files/digest-qmail-scanner-1.16-r2 b/net-mail/qmail-scanner/files/digest-qmail-scanner-1.16-r2
new file mode 100644
index 000000000000..8cd551a81271
--- /dev/null
+++ b/net-mail/qmail-scanner/files/digest-qmail-scanner-1.16-r2
@@ -0,0 +1 @@
+MD5 37b89fc12ef602886fe2bed7a2551309 qmail-scanner-1.16.tgz 117703
diff --git a/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild b/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild
new file mode 100644
index 000000000000..8998b5199077
--- /dev/null
+++ b/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmail-scanner/qmail-scanner-1.16-r2.ebuild,v 1.1 2003/11/29 04:11:49 robbat2 Exp $
+
+S=${WORKDIR}/${P}
+
+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
+	>=dev-perl/Time-HiRes-01.20-r2
+	>=net-mail/tnef-1.1.1
+	>=net-mail/maildrop-1.3.9
+	>=dev-perl/DB_File-1.803-r2
+	>=net-mail/qmail-1.03-r8
+	>=app-arch/unzip-5.42-r1
+	virtual/antivirus"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc ~ppc ~arm ~hppa ~alpha ~mips"
+
+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
+}
+
+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"
+}