Major cleaning and updates (thanks to Torsten and Florian Bauhaus).

15 files changed, 79 insertions, 184 deletions

diff --git a/net-mail/bogofilter/ChangeLog b/net-mail/bogofilter/ChangeLog
index d2e9224cd800..60e2e0294af2 100644
--- a/net-mail/bogofilter/ChangeLog
+++ b/net-mail/bogofilter/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-mail/bogofilter
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/ChangeLog,v 1.9 2003/05/14 07:49:44 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/ChangeLog,v 1.10 2003/05/29 19:06:14 g2boojum Exp $
+
+*bogofilter-0.13.3 (29 May 2003)
+
+  29 May 2003; Grant Goodyear <g2boojum@gentoo.org> bogofilter-0.10.3.ebuild,
+  bogofilter-0.11.1.3.ebuild, bogofilter-0.11.2.ebuild,
+  bogofilter-0.12.3.ebuild, bogofilter-0.13.3.ebuild, bogofilter-0.8.0.ebuild,
+  bogofilter-0.9.1.2.ebuild:
+  Big clean-up.  Made 0.11.2 stable on x86, added 0.13.3 (which is part
+  of their unstable branch, so ~ masked).  Thanks to Torsten for the 0.12.3
+  (whoops, 0.12.2) ebuild and to Florian Bauhaus for 0.12.3 (upon which
+  the 0.13.3 ebuild is based).
 
 *bogofilter-0.12.3 (14 May 2003)
 
diff --git a/net-mail/bogofilter/Manifest b/net-mail/bogofilter/Manifest
index da7ed0668e1f..9fd3a3e6bad9 100644
--- a/net-mail/bogofilter/Manifest
+++ b/net-mail/bogofilter/Manifest
@@ -1,16 +1,5 @@
-MD5 e1e46bdfedb1272a0f6a252081db7fc8 bogofilter-0.11.2.ebuild 1303
-MD5 2e57d2e5b73b068f7032c954e44e8852 bogofilter-0.13.3.ebuild 1887
-MD5 9f641370e8af7a95490bb736c3ac56bc .bogofilter-0.12.3.ebuild.swp 12288
-MD5 b4a9973bd1ea812453ade3ac3ff90ade bogofilter-0.8.0.ebuild 911
-MD5 e3a34e6b711a0f5d5683492b90741155 bogofilter-0.10.3.ebuild 1117
-MD5 e1e46bdfedb1272a0f6a252081db7fc8 bogofilter-0.11.1.3.ebuild 1303
-MD5 7f0a8e39b1352c62b921450713722c69 bogofilter-0.9.1.2.ebuild 914
-MD5 0270db7655c086abb0ee5514040fb7ac ChangeLog 1185
-MD5 b8ed7337c8168bfcd80ba9a62dad11ca bogofilter-0.12.3.ebuild 1886
-MD5 0a50b6c971a7fde30af43d89e63d5393 files/digest-bogofilter-0.11.1.3 71
-MD5 39659a4fc3f9ed5429675c5f206d578d files/digest-bogofilter-0.9.1.2 70
-MD5 298c2f7312545e1b6a6776ec24052666 files/digest-bogofilter-0.10.3 69
+MD5 85bbaf1b9784429197c4056c353af2de bogofilter-0.11.2.ebuild 1300
+MD5 371da997112e483904086125258937e3 bogofilter-0.13.3.ebuild 1885
+MD5 656830c628f62276da8a5fe0bcd4cecd ChangeLog 1714
 MD5 c32343db7444ec70462f26b49fdee65f files/digest-bogofilter-0.11.2 69
-MD5 6b92ee4cee2f990a3f0067b1381a65b4 files/digest-bogofilter-0.12.3 69
 MD5 1ec9835c10fd7a1f02715652f1bac91e files/digest-bogofilter-0.13.3 69
-MD5 9d02b836dfab9ff05daa8119e114fd68 files/digest-bogofilter-0.8.0 68
diff --git a/net-mail/bogofilter/bogofilter-0.10.3.ebuild b/net-mail/bogofilter/bogofilter-0.10.3.ebuild
deleted file mode 100644
index c45f54d7c3e7..000000000000
--- a/net-mail/bogofilter/bogofilter-0.10.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.10.3.ebuild,v 1.2 2003/02/16 00:18:12 vapier Exp $
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc"
-IUSE=""
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3*"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS CHANGES-0.10 COPYING METHODS NEWS README README.cvs TODO UPGRADE
-
-	dodir /usr/share/doc/${P}/samples
-	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
-	rmdir ${D}/etc
-
-	dohtml doc/*.html
-	docinto programmer ; dodoc doc/programmer/*
-
-	einfo "Read bogofilter's manual 'man bogofilter' for tips on how"
-	einfo "to integrate bogofilter with procmail and/or mutt."
-	einfo ""
-	einfo "The former being highly desirable to install in order to"
-	einfo "fully use bogofilter."
-}
diff --git a/net-mail/bogofilter/bogofilter-0.11.1.3.ebuild b/net-mail/bogofilter/bogofilter-0.11.2.ebuild
index 397054e67547..dff8618956e5 100644
--- a/net-mail/bogofilter/bogofilter-0.11.1.3.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.11.1.3.ebuild,v 1.2 2003/03/17 04:17:36 vladimir Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.11.2.ebuild,v 1.1 2003/05/29 19:06:14 g2boojum Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="~ppc ~x86 ~sparc"
+KEYWORDS="~ppc x86 ~sparc"
 IUSE=""
 
 DEPEND="virtual/glibc
diff --git a/net-mail/bogofilter/bogofilter-0.12.3.ebuild b/net-mail/bogofilter/bogofilter-0.12.3.ebuild
deleted file mode 100644
index 009d2d641b38..000000000000
--- a/net-mail/bogofilter/bogofilter-0.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.12.3.ebuild,v 1.1 2003/05/14 07:49:44 absinthe Exp $
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~ppc ~x86 ~sparc"
-IUSE=""
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3*"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS CHANGES-0.10 COPYING METHODS NEWS README README.cvs TODO UPGRADE
-
-	dodir /usr/share/doc/${P}/samples
-	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
-	rmdir ${D}/etc
-
-	dohtml doc/*.html
-	docinto programmer ; dodoc doc/programmer/*
-	
-	einfo "Starting with v0.11 the options of bogofilter are changed."
-	einfo "If you update from an old version, you eventually must change"
-	einfo "your configuration."
-	einfo ""
-	einfo "Read bogofilter's manual 'man bogofilter' for tips on how"
-	einfo "to integrate bogofilter with procmail and/or mutt."
-	einfo ""
-	einfo "The former being highly desirable to install in order to"
-	einfo "fully use bogofilter."
-}
diff --git a/net-mail/bogofilter/bogofilter-0.13.3.ebuild b/net-mail/bogofilter/bogofilter-0.13.3.ebuild
new file mode 100644
index 000000000000..2825cfa69bc1
--- /dev/null
+++ b/net-mail/bogofilter/bogofilter-0.13.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.13.3.ebuild,v 1.1 2003/05/29 19:06:14 g2boojum Exp $
+
+DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
+HOMEPAGE="http://bogofilter.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~ppc ~x86 ~sparc"
+IUSE=""
+
+DEPEND="virtual/glibc
+	>=sys-libs/db-3"
+
+S=${WORKDIR}/${P}
+
+src_compile() {
+	econf
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	exeinto /usr/lib/${PN}/tuning
+	doexe tuning/bogolex.sh tuning/distrib tuning/mkdb tuning/sizes tuning/smindev.sh
+	insinto /usr/lib/${PN}/tuning
+	doins tuning/smindev.R tuning/setR tuning/README
+	
+	exeinto /usr/lib/${PN}/contrib
+	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/parmtest.sh contrib/printmaildir.pl
+	doexe contrib/randomtrain contrib/scramble
+	insinto /usr/lib/${PN}/contrib
+	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
+	
+	dodoc AUTHORS INSTALL COPYING METHODS NEWS README README.cvs TODO UPGRADE
+	dodoc RELEASE.NOTES-0.1* CHANGES-0.1* doc/integrating-with-* doc/*.HOWTO
+	dodoc contrib/mailfilter.example contrib/procmailrc.example
+
+	dodir /usr/share/doc/${P}/samples
+	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
+	rmdir ${D}/etc
+
+	dohtml doc/*.html
+	docinto programmer ; dodoc doc/programmer/*
+}
+
+pkg_postinst() {
+	
+	einfo "With version 0.11 the options of bogofilter have changed."
+	einfo "If you update from an older version, you eventually must change"
+	einfo "your configuration."
+	einfo ""
+	einfo "Read bogofilter's manual 'man bogofilter' and have a look at"
+	einfo "the examples in the doc directory for tips on how"
+	einfo "to integrate bogofilter with procmail/maildrop and/or mutt."
+}
diff --git a/net-mail/bogofilter/bogofilter-0.8.0.ebuild b/net-mail/bogofilter/bogofilter-0.8.0.ebuild
deleted file mode 100644
index b5d60f296c1f..000000000000
--- a/net-mail/bogofilter/bogofilter-0.8.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.8.0.ebuild,v 1.3 2003/02/13 14:23:43 vapier Exp $
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="x86"
-IUSE=""
-
-DEPEND="virtual/glibc
-		>=sys-libs/db-3*"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bogofilter
-
-	doman bogofilter.1
-	dodoc NEWS README TODO
-
-	einfo "Read bogofilter's manual 'man bogofilter' for tips on how"
-	einfo "to integrate bogofilter with procmail and/or mutt."
-	einfo ""
-	einfo "The former being highly desirable to install in order to"
-	einfo "fully use bogofilter."
-}
diff --git a/net-mail/bogofilter/bogofilter-0.9.1.2.ebuild b/net-mail/bogofilter/bogofilter-0.9.1.2.ebuild
deleted file mode 100644
index e6e4e898eee0..000000000000
--- a/net-mail/bogofilter/bogofilter-0.9.1.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.9.1.2.ebuild,v 1.2 2003/02/13 14:23:49 vapier Exp $
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="virtual/glibc
-		>=sys-libs/db-3*"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	econf
-	emake || die
-}
-
-src_install() {
-	exeinto /usr/bin
-	doexe bogofilter
-
-	doman bogofilter.1
-	dodoc NEWS README TODO
-
-	einfo "Read bogofilter's manual 'man bogofilter' for tips on how"
-	einfo "to integrate bogofilter with procmail and/or mutt."
-	einfo ""
-	einfo "The former being highly desirable to install in order to"
-	einfo "fully use bogofilter."
-}
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.10.3 b/net-mail/bogofilter/files/digest-bogofilter-0.10.3
deleted file mode 100644
index e1807f49a627..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.10.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a90a70dcce9c2d4f1b26f87b502ab0d bogofilter-0.10.3.tar.gz 422403
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.11.1.3 b/net-mail/bogofilter/files/digest-bogofilter-0.11.1.3
deleted file mode 100644
index 60a370e21304..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.11.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c43a57fda050f7cde554f8b917799abf bogofilter-0.11.1.3.tar.gz 447122
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.11.2 b/net-mail/bogofilter/files/digest-bogofilter-0.11.2
new file mode 100644
index 000000000000..020113cde2dd
--- /dev/null
+++ b/net-mail/bogofilter/files/digest-bogofilter-0.11.2
@@ -0,0 +1 @@
+MD5 c0410b4378db01f77a133e6087fb69ef bogofilter-0.11.2.tar.gz 460747
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.12.3 b/net-mail/bogofilter/files/digest-bogofilter-0.12.3
deleted file mode 100644
index 967d77accf1c..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.12.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 775fd5a34d3f3629d4bb95105422ee67 bogofilter-0.12.3.tar.gz 485524
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.13.3 b/net-mail/bogofilter/files/digest-bogofilter-0.13.3
new file mode 100644
index 000000000000..b13f5bfa070f
--- /dev/null
+++ b/net-mail/bogofilter/files/digest-bogofilter-0.13.3
@@ -0,0 +1 @@
+MD5 d5da0ef6eb17e52dfe9c58ed2696f0bf bogofilter-0.13.3.tar.gz 541396
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.8.0 b/net-mail/bogofilter/files/digest-bogofilter-0.8.0
deleted file mode 100644
index 3569cd9ee2cb..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 447d6045f0268c0f6f36c59176c08137 bogofilter-0.8.0.tar.gz 178000
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.9.1.2 b/net-mail/bogofilter/files/digest-bogofilter-0.9.1.2
deleted file mode 100644
index 4dcbde5a15ec..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.9.1.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af65cc2a1dae5597762bc2144344075a bogofilter-0.9.1.2.tar.gz 358122