Undone seemant's bungling

5 files changed, 68 insertions, 10 deletions

diff --git a/net-mail/popfile/ChangeLog b/net-mail/popfile/ChangeLog
index d43be77faec0..d859910e0c19 100644
--- a/net-mail/popfile/ChangeLog
+++ b/net-mail/popfile/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-mail/popfile
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popfile/ChangeLog,v 1.3 2004/03/27 19:53:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popfile/ChangeLog,v 1.4 2004/04/17 20:26:05 stuart Exp $
+
+*popfile-0.20.1 (17 Apr 2004)
+
+  17 Apr 2004; Stuart Herbert <stuart@gentoo.org> popfile-0.20.1.ebuild,
+  popfile-0.21.1.ebuild:
+  Added popfile-0.20.1.ebuild, to provide the correct fix for bug #45883.
+  
+  Added missing dependency DBD:SQLite to popfile-0.21.1.ebuild, and marked it as
+  unstable for testing. Fixes bug #48031.
 
   27 Mar 2004; Seemant Kulleen <seemant@gentoo.org> popfile-0.21.1.ebuild:
   fetch the CORRECT sources, for crying out loud. Use the portage variables for
diff --git a/net-mail/popfile/Manifest b/net-mail/popfile/Manifest
index fd60bbeebe78..d09fb1cbbeae 100644
--- a/net-mail/popfile/Manifest
+++ b/net-mail/popfile/Manifest
@@ -1,4 +1,6 @@
-MD5 e3e8e3470ecca7a0bfa76b5c10b44134 popfile-0.21.1.ebuild 1099
-MD5 be877309660c76dd23dbdbd0d6b1cd5d ChangeLog 808
+MD5 52aab0d9401456356aef0e264cc347fa popfile-0.21.1.ebuild 1134
+MD5 9c5e49a7836e87fe395642fd5708dc4c ChangeLog 1138
 MD5 7ffa9bf1b757cbd93afb8c746fcd24e6 metadata.xml 293
+MD5 e3e8e3470ecca7a0bfa76b5c10b44134 popfile-0.20.1.ebuild 1099
 MD5 d9d12773e8397a1960eab275e3bcc8c4 files/digest-popfile-0.21.1 64
+MD5 b97d4969666f64a2d8b7c050253dc29b files/digest-popfile-0.20.1 64
diff --git a/net-mail/popfile/files/digest-popfile-0.20.1 b/net-mail/popfile/files/digest-popfile-0.20.1
new file mode 100644
index 000000000000..5c7a2ad6edc4
--- /dev/null
+++ b/net-mail/popfile/files/digest-popfile-0.20.1
@@ -0,0 +1 @@
+MD5 f37bbd25aa81e98f3846389b26390062 popfile-0.20.1.zip 1912427
diff --git a/net-mail/popfile/popfile-0.20.1.ebuild b/net-mail/popfile/popfile-0.20.1.ebuild
new file mode 100644
index 000000000000..5611a0aff4f0
--- /dev/null
+++ b/net-mail/popfile/popfile-0.20.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popfile/popfile-0.20.1.ebuild,v 1.1 2004/04/17 20:26:05 stuart Exp $
+
+IUSE=""
+
+S=${WORKDIR}
+DESCRIPTION="Anti-spam filter"
+HOMEPAGE="http://foo.bar.com/"
+SRC_URI="mirror://sourceforge/popfile/${P}.zip"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND=">=dev-lang/perl-5.8
+	>=dev-perl/BerkeleyDB-0.25
+	dev-perl/Text-Kakasi
+	dev-perl/MIME-Base64
+	dev-perl/HTML-Tagset"
+
+
+src_compile() {
+	# do nothing
+	echo > /dev/null
+}
+
+src_install() {
+	# yes, this is crude, but it's a start
+
+	dodir /usr/share/popfile
+	find . -type f -print | xargs chmod 600
+	find . -type d -print | xargs chmod 700
+	tar -cf - * | ( cd ${D}/usr/share/popfile && tar -xf - )
+
+	fperms 0755 usr/share/popfile/popfile.pl
+	dodir /usr/share/popfile/corpus
+	dodir /usr/share/popfile/messages
+}
+
+pkg_postinst () {
+	einfo "To start popfile, run /usr/share/popfile/popfile.pl"
+	einfo
+	einfo "A /etc/init.d script will be added once popfile can support"
+	einfo "multiple users"
+}
diff --git a/net-mail/popfile/popfile-0.21.1.ebuild b/net-mail/popfile/popfile-0.21.1.ebuild
index 226b1d97b951..0c35975e3fa7 100644
--- a/net-mail/popfile/popfile-0.21.1.ebuild
+++ b/net-mail/popfile/popfile-0.21.1.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/popfile/popfile-0.21.1.ebuild,v 1.3 2004/03/27 19:53:16 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/popfile/popfile-0.21.1.ebuild,v 1.4 2004/04/17 20:26:05 stuart Exp $
 
 IUSE=""
 
 S=${WORKDIR}
-DESCRIPTION="Anti-spam filter"
-HOMEPAGE="http://foo.bar.com/"
+DESCRIPTION="Anti-spam bayesian filter"
+HOMEPAGE="http://popfile.sourceforge.net/"
 SRC_URI="mirror://sourceforge/popfile/${P}.zip"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 
 DEPEND=">=dev-lang/perl-5.8
-	>=dev-perl/BerkeleyDB-0.25
+	dev-perl/Digest-MD5
 	dev-perl/Text-Kakasi
 	dev-perl/MIME-Base64
-	dev-perl/HTML-Tagset"
-
+	dev-perl/HTML-Tagset
+	dev-perl/DBD-SQLite"
 
 src_compile() {
 	# do nothing