Fix keyword issues by making depend _really_ special, and add 2 new versions. 0.16.4 should be moved to stable cautiously as it deprecates many features

7 files changed, 139 insertions, 11 deletions

diff --git a/net-mail/bogofilter/ChangeLog b/net-mail/bogofilter/ChangeLog
index f3c1ad127163..0389767671f9 100644
--- a/net-mail/bogofilter/ChangeLog
+++ b/net-mail/bogofilter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/bogofilter
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/ChangeLog,v 1.26 2004/02/07 03:23:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/ChangeLog,v 1.27 2004/02/10 16:51:30 lostlogic Exp $
+
+*bogofilter-0.17.1 (10 Feb 2004)
+
+  10 Feb 2004; Brandon Low <lostlogic@gentoo.org> bogofilter-0.15.13.1.ebuild,
+  bogofilter-0.16.4.ebuild, bogofilter-0.17.1.ebuild:
+  Fix keyword issues by making depend _really_ special, and add 2 new versions.
+  0.16.4 should be moved to stable cautiously as it deprecates many features
 
   07 Feb 2004; Lars Weiler <pylon@gentoo.org> bogofilter-0.15.13.1.ebuild:
   stable on ppc
diff --git a/net-mail/bogofilter/Manifest b/net-mail/bogofilter/Manifest
index 7a2612d66c16..c467191c6597 100644
--- a/net-mail/bogofilter/Manifest
+++ b/net-mail/bogofilter/Manifest
@@ -1,8 +1,12 @@
-MD5 e7b33018c17519aafe42e44aac6779ec ChangeLog 4635
+MD5 25858b5ba07b81aef73dbc39fd0a1d27 bogofilter-0.15.13.1.ebuild 1732
 MD5 1db3c6b4a750151899aa5c36e4385a00 bogofilter-0.13.7.3.ebuild 1921
+MD5 abc30cc1cbd7e2e245a7555a27221cf4 bogofilter-0.16.4.ebuild 1725
 MD5 90cf3a884bc6ffe51a4c94ebfb73f608 bogofilter-0.14.5.4.ebuild 1944
+MD5 e7b33018c17519aafe42e44aac6779ec ChangeLog 4635
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 d0a9555aa2bf7d4fb91dc5bcf96d8cdb bogofilter-0.15.13.1.ebuild 1753
+MD5 9d5261ed3322d58880010226c0c52001 bogofilter-0.17.1.ebuild 1722
+MD5 23c682cb2599ab79e60b6454bbcc80ff files/digest-bogofilter-0.15.13.1 72
 MD5 23dea37013aa783a31cd6a713e040752 files/digest-bogofilter-0.13.7.3 71
 MD5 856317ca43eaa2fe5e6f1029e36b3f1e files/digest-bogofilter-0.14.5.4 71
-MD5 23c682cb2599ab79e60b6454bbcc80ff files/digest-bogofilter-0.15.13.1 72
+MD5 0459fc8764bb8f8aa1c64c4c16c0b264 files/digest-bogofilter-0.16.4 69
+MD5 b765e18e8c102cd08e33265f2f43b570 files/digest-bogofilter-0.17.1 69
diff --git a/net-mail/bogofilter/bogofilter-0.15.13.1.ebuild b/net-mail/bogofilter/bogofilter-0.15.13.1.ebuild
index e45fb256a8e9..f791242c0b96 100644
--- a/net-mail/bogofilter/bogofilter-0.15.13.1.ebuild
+++ b/net-mail/bogofilter/bogofilter-0.15.13.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.13.1.ebuild,v 1.2 2004/02/07 03:23:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.15.13.1.ebuild,v 1.3 2004/02/10 16:51:30 lostlogic Exp $
 
 IUSE=""
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
@@ -9,11 +9,11 @@ SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~hppa ~mips ~arm ~amd64 ~ia64 ~ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~hppa ~amd64 ~arm ~mips ~ppc64"
 
 DEPEND="virtual/glibc
-	app-text/xmlto
-	>=sys-libs/db-3"
+	>=sys-libs/db-3
+	!arm? ( !mips? ( !ppc64? ( doc? ( app-text/xmlto ) ) ) )"
 
 RDEPEND="virtual/glibc
 	>=sys-libs/db-3"
@@ -32,12 +32,15 @@ src_install() {
 	dodoc RELEASE.NOTES* TODO UPGRADE
 	dodoc doc/integrating-with-* doc/*.HOWTO contrib/*.example
 
-	dodir /usr/share/doc/${P}/samples
+	dodir /usr/share/doc/${PF}/samples
 	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
 	rmdir ${D}/etc
 
-	dohtml doc/*.html
-	docinto programmer ; dodoc doc/programmer/*
+	if use doc; then
+		dohtml doc/*.html
+	else
+		dohtml doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
+	fi
 }
 
 pkg_postinst() {
diff --git a/net-mail/bogofilter/bogofilter-0.16.4.ebuild b/net-mail/bogofilter/bogofilter-0.16.4.ebuild
new file mode 100644
index 000000000000..1d022c924d7c
--- /dev/null
+++ b/net-mail/bogofilter/bogofilter-0.16.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.16.4.ebuild,v 1.1 2004/02/10 16:51:30 lostlogic Exp $
+
+IUSE="doc"
+
+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 ~ppc ~sparc ~alpha ~ia64 ~hppa ~amd64 ~mips ~ppc64 ~arm"
+
+DEPEND="virtual/glibc
+	!arm? ( !mips? ( !ppc64? ( doc? ( app-text/xmlto ) ) ) )
+	>=sys-libs/db-3.2"
+
+RDEPEND="virtual/glibc
+	>=sys-libs/db-3.2"
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	exeinto /usr/lib/${PN}/contrib
+	doexe contrib/{bogofilter-qfe,bogogrep,mime.get.rfc822,parmtest.sh}
+	doexe contrib/{randomtrain,scramble,*.pl}
+
+	insinto /usr/lib/${PN}/contrib
+	doins contrib/{README.*,bogo.R,bogogrep.c,dot-qmail-bogofilter-default}
+	doins contrib/{trainbogo.sh,*.example}
+
+	dodoc AUTHORS CHANGES* COPYING INSTALL METHODS NEWS README
+	dodoc RELEASE.NOTES* TODO doc/{integrating-with-*,*.HOWTO}
+
+	dodir /usr/share/doc/${PF}/samples
+	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
+	rmdir ${D}/etc
+
+	#if xmlto is installed, html docu is gernerated automatically
+	#if xmlto is not installed, there is still a html faq
+	if use doc; then
+		dohtml doc/*.html
+	else
+		dohtml doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
+	fi
+}
+
+pkg_postinst() {
+	einfo "The goal of the bogofilter 0.16 series is to clean out this excess code."
+	einfo "A number of features have been deprecated."
+	ewarn "Please read the RELEASE.NOTES-0.16 carefully!"
+	einfo ""
+	einfo "Contributed tools and documentation is in ${ROOT}usr/lib/${PN}/contrib"
+	einfo "beside documentation in ${ROOT}usr/share/doc/${PF}."
+}
diff --git a/net-mail/bogofilter/bogofilter-0.17.1.ebuild b/net-mail/bogofilter/bogofilter-0.17.1.ebuild
new file mode 100644
index 000000000000..6c77d15845eb
--- /dev/null
+++ b/net-mail/bogofilter/bogofilter-0.17.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/bogofilter/bogofilter-0.17.1.ebuild,v 1.1 2004/02/10 16:51:30 lostlogic Exp $
+
+IUSE="doc"
+
+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 ~ppc ~sparc ~alpha ~ia64 ~hppa ~amd64 ~mips ~ppc64 ~arm"
+
+DEPEND="virtual/glibc
+	!arm? ( !mips? ( !ppc64? ( doc? ( app-text/xmlto ) ) ) )
+	>=sys-libs/db-3.2"
+
+RDEPEND="virtual/glibc
+	>=sys-libs/db-3.2"
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	exeinto /usr/lib/${PN}/contrib
+	doexe contrib/{bogofilter-qfe,bogogrep,mime.get.rfc822,parmtest.sh}
+	doexe contrib/{randomtrain,scramble,*.pl}
+
+	insinto /usr/lib/${PN}/contrib
+	doins contrib/{README.*,bogo.R,bogogrep.c,dot-qmail-bogofilter-default}
+	doins contrib/{trainbogo.sh,*.example}
+
+	dodoc AUTHORS CHANGES* COPYING INSTALL METHODS NEWS README
+	dodoc RELEASE.NOTES* TODO doc/{integrating-with-*,*.HOWTO}
+
+	dodir /usr/share/doc/${PF}/samples
+	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
+	rmdir ${D}/etc
+
+	#if xmlto is installed, html docu is gernerated automatically
+	#if xmlto is not installed, there is still a html faq
+	if use doc; then
+		dohtml doc/*.html
+	else
+		dohtml doc/bogofilter-faq.html doc/bogofilter-faq-fr.html
+	fi
+}
+
+pkg_postinst() {
+	einfo "The goal of the bogofilter 0.17 series is to clean out this excess code."
+	einfo "A number of features have been removed."
+	ewarn "Please read the RELEASE.NOTES-0.17 carefully!"
+	einfo ""
+	einfo "Contributed tools and documentation is in ${ROOT}usr/lib/${PN}/contrib"
+	einfo "beside documentation in ${ROOT}usr/share/doc/${PF}."
+}
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.16.4 b/net-mail/bogofilter/files/digest-bogofilter-0.16.4
new file mode 100644
index 000000000000..9aa05028baea
--- /dev/null
+++ b/net-mail/bogofilter/files/digest-bogofilter-0.16.4
@@ -0,0 +1 @@
+MD5 3f20cdd44b80a08d2114c5d95d485915 bogofilter-0.16.4.tar.gz 725732
diff --git a/net-mail/bogofilter/files/digest-bogofilter-0.17.1 b/net-mail/bogofilter/files/digest-bogofilter-0.17.1
new file mode 100644
index 000000000000..96f467245039
--- /dev/null
+++ b/net-mail/bogofilter/files/digest-bogofilter-0.17.1
@@ -0,0 +1 @@
+MD5 ca692cb4733add0b3f5eea7843049385 bogofilter-0.17.1.tar.gz 726206