version bump thanks to: tove <bugs@veller.net> in bug #36452

9 files changed, 24 insertions, 138 deletions

diff --git a/net-mail/bogofilter/Manifest b/net-mail/bogofilter/Manifest
index b10d792981ba..eb7947f2f690 100644
--- a/net-mail/bogofilter/Manifest
+++ b/net-mail/bogofilter/Manifest
@@ -1,10 +1,8 @@
 MD5 6b686e8fe56963643a30cd7fbe0a4169 bogofilter-0.13.7.3.ebuild 1921
-MD5 b3dc254644a46bd39a38969f6996a0d7 bogofilter-0.15.13.ebuild 1637
-MD5 0ba8170e3cea6c06fd2afac55fa40dbd bogofilter-0.14.5.4.ebuild 1942
-MD5 bda305b789c17c14cc7483f1721ca335 ChangeLog 3781
+MD5 c2322bde3767c1e0899f52a0a4f5db11 bogofilter-0.15.13.ebuild 1635
+MD5 540d990001550a19e9397729e9f00380 bogofilter-0.14.5.4.ebuild 1944
+MD5 81973a0d5d75b9247a07319ce5a4ba23 ChangeLog 4192
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 3151751646336d3072e9fdae989c8a47 bogofilter-0.15.12.ebuild 1925
 MD5 23dea37013aa783a31cd6a713e040752 files/digest-bogofilter-0.13.7.3 71
 MD5 856317ca43eaa2fe5e6f1029e36b3f1e files/digest-bogofilter-0.14.5.4 71
-MD5 5a53a9a4e1886c81cc86a1e80d1e5402 files/digest-bogofilter-0.15.12 70
 MD5 fc7147b3c11986fa1b4ee2e03b8b0a89 files/digest-bogofilter-0.15.13 70
diff --git a/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild b/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild
deleted file mode 100644
index 5a962d381df4..000000000000
--- a/net-mail/bogofilter/bogofilter-0.14.5.2.ebuild
+++ /dev/null
@@ -1,54 +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.14.5.2.ebuild,v 1.2 2003/09/05 02:24:48 msterret Exp $
-
-IUSE=""
-
-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 ~amd64"
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3"
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /usr/lib/${PN}/tuning
-	insinto /usr/lib/${PN}/tuning
-	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
-	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
-
-	exeinto /usr/lib/${PN}/contrib
-	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
-	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble contrib/bogofilter-milter.pl
-	doexe contrib/bogominitrain.pl
-	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.14 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, postfix or qmail."
-}
diff --git a/net-mail/bogofilter/bogofilter-0.14.5.4.ebuild b/net-mail/bogofilter/bogofilter-0.14.5.4.ebuild
index 8c5162b736b4..be23947afdbb 100644
--- a/net-mail/bogofilter/bogofilter-0.14.5.4.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.14.5.4.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.14.5.4.ebuild,v 1.1 2003/10/06 20:28:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.14.5.4.ebuild,v 1.2 2003/12/29 10:12:47 seemant Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc ~x86 ~sparc ~amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64 ~ppc64"
 
 DEPEND="virtual/glibc
 	>=sys-libs/db-3"
diff --git a/net-mail/bogofilter/bogofilter-0.14.5.ebuild b/net-mail/bogofilter/bogofilter-0.14.5.ebuild
deleted file mode 100644
index 7d57bb4d98fc..000000000000
--- a/net-mail/bogofilter/bogofilter-0.14.5.ebuild
+++ /dev/null
@@ -1,54 +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.14.5.ebuild,v 1.3 2003/09/05 02:24:48 msterret Exp $
-
-IUSE=""
-
-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 ~amd64"
-
-DEPEND="virtual/glibc
-	>=sys-libs/db-3"
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /usr/lib/${PN}/tuning
-	insinto /usr/lib/${PN}/tuning
-	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
-	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
-
-	exeinto /usr/lib/${PN}/contrib
-	doexe contrib/bogofilter-qfe contrib/bogogrep contrib/mime.get.rfc822 contrib/parmtest.sh
-	doexe contrib/printmaildir.pl contrib/randomtrain contrib/scramble contrib/bogofilter-milter.pl
-	doexe contrib/bogominitrain.pl
-	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.14 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, postfix or qmail."
-}
diff --git a/net-mail/bogofilter/bogofilter-0.15.12.ebuild b/net-mail/bogofilter/bogofilter-0.15.13.ebuild
index 2636fb237841..9be30bfd062b 100644
--- a/net-mail/bogofilter/bogofilter-0.15.12.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.15.13.ebuild
@@ -1,8 +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.15.12.ebuild,v 1.1 2003/12/27 08:05:31 seemant Exp $
-
-IUSE=""
+# $Header:
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -10,29 +8,28 @@ SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64 ~ppc64"
 
 DEPEND="virtual/glibc
+	app-text/xmlto
 	>=sys-libs/db-3"
 
-src_install() {
-	make DESTDIR=${D} install || die
+RDEPEND="virtual/glibc
+	>=sys-libs/db-3"
 
-	exeinto /usr/lib/${PN}/tuning
-	insinto /usr/lib/${PN}/tuning
-	doexe tuning/bogolex.sh tuning/bogol tuning/bogotune
-	doins tuning/README.bogotune tuning/bogol.1 tuning/bogotune.1
+src_install() {
+	make install DESTDIR=${D} || die
 
 	exeinto /usr/lib/${PN}/contrib
 	doexe contrib/{bogofilter-qfe,bogogrep,mime.get.rfc822,parmtest.sh}
-	doexe contrib/{printmaildir.pl,randomtrain,scramble,bogofilter-milter.pl}
-	doexe contrib/bogominitrain.pl
+	doexe contrib/{randomtrain,scramble,*.pl}
+
 	insinto /usr/lib/${PN}/contrib
-	doins contrib/README.randomtrain contrib/bogo.R contrib/trainbogo.sh
+	doins contrib/{README.randomtrain,bogo.R,dot-qmail-bogofilter-default,trainbogo.sh}
 
-	dodoc AUTHORS INSTALL COPYING METHODS NEWS README* TODO UPGRADE
-	dodoc RELEASE* CHANGE* doc/integrating-with-* doc/*.HOWTO
-	dodoc contrib/mailfilter.example contrib/procmailrc.example
+	dodoc AUTHORS CHANGES* COPYING INSTALL METHODS NEWS README
+	dodoc RELEASE.NOTES* TODO UPGRADE
+	dodoc doc/integrating-with-* doc/*.HOWTO contrib/*.example
 
 	dodir /usr/share/doc/${P}/samples
 	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
@@ -43,13 +40,14 @@ src_install() {
 }
 
 pkg_postinst() {
-
-	einfo "With version 0.15 the options of bogofilter have changed."
-	einfo "If you update from an older version, you eventually must change"
-	einfo "your configuration."
+	einfo ""
+	einfo "For best results it is recommended to retrain bogofilter"
+	einfo "if you upgrade from a version 0.15.4 or older,"
+	einfo "because the header handling was improved."
 	ewarn "Please read specifically about the new -H option"
 	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, postfix or qmail."
+	einfo ""
 }
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.14.5 b/net-mail/bogofilter/files/digest-bogofilter-0.14.5
deleted file mode 100644
index 4502dc55ead3..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.14.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 170b44951c0135cb8f70734e18d6a3f1 bogofilter-0.14.5.tar.gz 877860
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.14.5.2 b/net-mail/bogofilter/files/digest-bogofilter-0.14.5.2
deleted file mode 100644
index 903e4ec35c4a..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.14.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0ef3eb34943e10e9e317063307148940 bogofilter-0.14.5.2.tar.gz 878293
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.15.12 b/net-mail/bogofilter/files/digest-bogofilter-0.15.12
deleted file mode 100644
index dbc8e9170b6e..000000000000
--- a/net-mail/bogofilter/files/digest-bogofilter-0.15.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2f714c81e7b8132ddc70d4483a79ecbc bogofilter-0.15.12.tar.gz 715974
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.15.13 b/net-mail/bogofilter/files/digest-bogofilter-0.15.13
new file mode 100644
index 000000000000..6354997725a4
--- /dev/null
+++ b/net-mail/bogofilter/files/digest-bogofilter-0.15.13
@@ -0,0 +1 @@
+MD5 ffc44abc9cb211ee6e52d19465c95947 bogofilter-0.15.13.tar.gz 716368