Version bump: 0.96.5 aka 1.0.0-rc5. Removed old ebuilds.

(Portage version: 2.0.53_rc7)

9 files changed, 27 insertions, 212 deletions

diff --git a/mail-filter/bogofilter/ChangeLog b/mail-filter/bogofilter/ChangeLog
index 0b63769dbff3..a7e67cf46014 100644
--- a/mail-filter/bogofilter/ChangeLog
+++ b/mail-filter/bogofilter/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-filter/bogofilter
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.40 2005/09/25 18:49:12 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.41 2005/11/08 21:17:35 tove Exp $
+
+*bogofilter-0.96.5 (08 Nov 2005)
+
+  08 Nov 2005; Torsten Veller <tove@gentoo.org> -bogofilter-0.94.14.ebuild,
+  -bogofilter-0.95.2.ebuild, -bogofilter-0.96.2.ebuild,
+  +bogofilter-0.96.5.ebuild:
+  Version bump: 0.96.5 a.k.a. 1.0.0-rc5
 
 *bogofilter-0.96.2 (25 Sep 2005)
 
diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 6a408133e3cb..3adef374956f 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 320945affc3d3983855cbd409565c1d7 bogofilter-0.96.2.ebuild 2468
-MD5 e4bfdf5d18231412651867d6506c9d53 bogofilter-0.94.14.ebuild 2446
-MD5 28717e3faee82dbca88d83de9c9afadc bogofilter-0.92.8.ebuild 1575
 MD5 350b33e3771f0182050d27b09673a95a ChangeLog 12760
-MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
+MD5 28717e3faee82dbca88d83de9c9afadc bogofilter-0.92.8.ebuild 1575
+MD5 e4bfdf5d18231412651867d6506c9d53 bogofilter-0.94.14.ebuild 2446
 MD5 5c37618a8b15dd2b250f78aaa0d20a54 bogofilter-0.95.2.ebuild 2482
-MD5 5d294556f965d8a34f818dd691028d3a files/digest-bogofilter-0.94.14 71
+MD5 546a130726752708e31f4db7b4089bd3 bogofilter-0.96.2.ebuild 2466
+MD5 689f705a10b038733d8cc00000731d1e bogofilter-0.96.5.ebuild 2397
 MD5 1970df6e6d8dabe53d04a6f120d0b8bb files/digest-bogofilter-0.92.8 70
+MD5 5d294556f965d8a34f818dd691028d3a files/digest-bogofilter-0.94.14 71
 MD5 36abbe0564d3ec8d59dabd4c15f21f25 files/digest-bogofilter-0.95.2 70
 MD5 596ada68a40992a781a00a8d84f5ca9d files/digest-bogofilter-0.96.2 70
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNvFKV3J2n04EauwRAnGwAJwInVYj9yz0E0gyc2uylAwKrP5mrwCg0O5v
-wfhE9jJE2oY/dsbSyY/FB3s=
-=up4s
------END PGP SIGNATURE-----
+MD5 4d0b162c16401cd805a8c5bededda302 files/digest-bogofilter-0.96.5 70
+MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
diff --git a/mail-filter/bogofilter/bogofilter-0.94.14.ebuild b/mail-filter/bogofilter/bogofilter-0.94.14.ebuild
deleted file mode 100644
index d71c44efedee..000000000000
--- a/mail-filter/bogofilter/bogofilter-0.94.14.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.94.14.ebuild,v 1.2 2005/06/09 19:41:15 tove Exp $
-
-inherit eutils
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#KEYWORDS="${KEYWORDS} ~arm ~mips" # missing, see bug #74046
-IUSE="doc iconv gsl berkdb sqlite"
-
-DEPEND="virtual/libc
-	iconv? (
-		|| (
-			sys-libs/glibc
-			dev-libs/libiconv
-		)
-	)
-	berkdb?  ( >=sys-libs/db-3.2 )
-	!berkdb? ( sqlite? ( >=dev-db/sqlite-3.2 ) )
-	!berkdb? ( !sqlite? ( >=sys-libs/db-3.2 ) )
-	gsl? ( sci-libs/gsl )"
-#	app-arch/pax" # only needed for bf_tar
-
-src_compile() {
-	local myconf=""
-	useq !gsl && myconf="${myconf} --with-included-gsl" # 'without-' doesn't work
-#	myconf="$(use_with !gsl included-gsl)"
-	myconf="${myconf} $(use_enable iconv)"
-
-	# determine backend: berkdb *is* default
-	if useq berkdb && useq sqlite ; then
-		einfo "Both berkdb and sqlite are in USE."
-		einfo "Choosing berkdb as default database backend."
-	elif useq sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-	elif ! useq berkdb ; then
-		einfo "Using berkdb as database backend."
-	fi
-
-	econf ${myconf} || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,bogogrep,mime.get.rfc822,parmtest.sh}
-	doexe contrib/{randomtrain,scramble,*.pl}
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,bogo.R,bogogrep.c,dot-qmail-bogofilter-default}
-	doins contrib/{trainbogo.sh,*.example}
-
-	dodoc AUTHORS COPYING INSTALL NEWS README
-	dodoc RELEASE.NOTES* TODO doc/integrating-with-*
-	dodoc GETTING.STARTED doc/README.{db,sqlite}
-
-	dodir /usr/share/doc/${PF}/samples
-	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
-	rmdir ${D}/etc
-
-	if useq doc; then
-		dohtml doc/*.html
-	else
-		dohtml doc/bogofilter-faq{,-fr}.html doc/bogofilter-tuning.HOWTO.html
-	fi
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "Incompatible changes in bogofilter-0.93 and -0.94:"
-	ewarn "Please read the documentation (RELEASE.NOTES)!"
-	ewarn ""
-	einfo ""
-	einfo "If you need ${ROOT}usr/bin/bf_tar please install app-arch/pax."
-	einfo ""
-}
diff --git a/mail-filter/bogofilter/bogofilter-0.95.2.ebuild b/mail-filter/bogofilter/bogofilter-0.95.2.ebuild
deleted file mode 100644
index 27be413c4e89..000000000000
--- a/mail-filter/bogofilter/bogofilter-0.95.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.95.2.ebuild,v 1.1 2005/07/12 09:11:37 tove Exp $
-
-inherit eutils
-
-DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
-HOMEPAGE="http://bogofilter.sourceforge.net/"
-SRC_URI="mirror://sourceforge/bogofilter/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-#KEYWORDS="${KEYWORDS} ~arm ~mips" # missing, see bug #74046
-IUSE="doc gsl berkdb sqlite"
-
-DEPEND="
-	|| (
-		sys-libs/glibc
-		dev-libs/libiconv
-	)
-	berkdb?  ( >=sys-libs/db-3.2 )
-	!berkdb? (
-		sqlite?  ( >=dev-db/sqlite-3.2.2 )
-		!sqlite? ( >=sys-libs/db-3.2 )
-	)
-	gsl? ( sci-libs/gsl )"
-#	app-arch/pax" # only needed for bf_tar
-
-pkg_setup() {
-	einfo ""
-	einfo "It is best to dump or backup your wordlists BEFORE upgrading!"
-	einfo ""
-	epause 3
-}
-
-src_compile() {
-	local myconf=""
-	useq !gsl && myconf="${myconf} --with-included-gsl" # 'without-' doesn't work
-#	myconf="$(use_with !gsl included-gsl)"
-
-	# determine backend: berkdb *is* default
-	if useq berkdb && useq sqlite ; then
-		einfo "Both berkdb and sqlite are in USE."
-		einfo "Choosing berkdb as default database backend."
-	elif useq sqlite ; then
-		myconf="${myconf} --with-database=sqlite"
-	elif ! useq berkdb ; then
-		einfo "Using berkdb as database backend."
-	fi
-
-	econf ${myconf} || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,bogogrep,mime.get.rfc822,parmtest.sh}
-	doexe contrib/{randomtrain,scramble,*.pl}
-
-	insinto /usr/share/${PN}/contrib
-	doins contrib/{README.*,bogo.R,bogogrep.c,dot-qmail-bogofilter-default}
-	doins contrib/{trainbogo.sh,*.example}
-
-	dodoc AUTHORS COPYING INSTALL NEWS README
-	dodoc RELEASE.NOTES* TODO doc/integrating-with-*
-	dodoc GETTING.STARTED doc/README.{db,sqlite}
-
-	dodir /usr/share/doc/${PF}/samples
-	mv ${D}/etc/* ${D}/usr/share/doc/${PF}/samples/
-	rmdir ${D}/etc
-
-	if useq doc; then
-		dohtml doc/*.html
-	else
-		dohtml doc/bogofilter-faq{,-fr}.html doc/bogofilter-tuning.HOWTO.html
-	fi
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "Incompatible changes in bogofilter-0.93 and -0.94:"
-	ewarn "Please read the documentation (RELEASE.NOTES)!"
-	ewarn ""
-	einfo ""
-	einfo "If you need ${ROOT}usr/bin/bf_tar please install app-arch/pax."
-	einfo ""
-}
diff --git a/mail-filter/bogofilter/bogofilter-0.96.2.ebuild b/mail-filter/bogofilter/bogofilter-0.96.5.ebuild
index 395e9cf34e51..922b0df3e5ee 100644
--- a/mail-filter/bogofilter/bogofilter-0.96.2.ebuild
+++ b/mail-filter/bogofilter/bogofilter-0.96.5.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.96.2.ebuild,v 1.1 2005/09/25 18:49:12 tove Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-0.96.5.ebuild,v 1.1 2005/11/08 21:17:35 tove Exp $
 
 DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed."
 HOMEPAGE="http://bogofilter.sourceforge.net/"
@@ -23,14 +21,6 @@ DEPEND="
 	gsl? ( sci-libs/gsl )"
 #	app-arch/pax" # only needed for bf_tar
 
-pkg_setup() {
-	einfo ""
-	einfo "Better safe than sorry:"
-	einfo "It is best to dump or backup your wordlists BEFORE upgrading!"
-	einfo ""
-	epause
-}
-
 src_compile() {
 	local myconf=""
 	myconf="$(use_with !gsl included-gsl)"
@@ -39,9 +29,9 @@ src_compile() {
 	if use berkdb && use sqlite ; then
 		einfo "Both berkdb and sqlite are in USE."
 		einfo "Choosing berkdb as default database backend."
-	elif useq sqlite ; then
+	elif use sqlite ; then
 		myconf="${myconf} --with-database=sqlite"
-	elif ! useq berkdb ; then
+	elif ! use berkdb ; then
 		einfo "Using berkdb as database backend."
 	fi
 
@@ -50,18 +40,20 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed."
+	make DESTDIR="${D}" install || die "make install failed"
 
 	exeinto /usr/share/${PN}/contrib
-	doexe contrib/{bogofilter-qfe,bogogrep,mime.get.rfc822} \
-		contrib/{parmtest.sh,randomtrain,scramble,*.pl} || die "doexe failed."
+	doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
+		contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
+		contrib/{spamitarium,stripsearch}.pl || die "doexec failed"
 
 	insinto /usr/share/${PN}/contrib
 	doins contrib/{README.*,dot-qmail-bogofilter-default} \
-		contrib/{bogogrep.c,bogo.R,trainbogo.sh,*.example} || die "doins failed"
+		contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
+		contrib/{trainbogo,scramble}.sh || die "doins failed"
 
-	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED
-	dodoc doc/integrating-with-* doc/README.{db,sqlite}
+	dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
+		doc/integrating-with-* doc/README.{db,sqlite}
 
 	dodir /usr/share/doc/${PF}/samples
 	mv "${D}"/etc/* "${D}"/usr/share/doc/${PF}/samples/
diff --git a/mail-filter/bogofilter/files/digest-bogofilter-0.94.14 b/mail-filter/bogofilter/files/digest-bogofilter-0.94.14
deleted file mode 100644
index 65b73cd60509..000000000000
--- a/mail-filter/bogofilter/files/digest-bogofilter-0.94.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 59fa3eefc510458f786c893de271b819 bogofilter-0.94.14.tar.bz2 723279
diff --git a/mail-filter/bogofilter/files/digest-bogofilter-0.95.2 b/mail-filter/bogofilter/files/digest-bogofilter-0.95.2
deleted file mode 100644
index c88b7e6477d1..000000000000
--- a/mail-filter/bogofilter/files/digest-bogofilter-0.95.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 43da78d185f6a206923e6fb8e50c6fe7 bogofilter-0.95.2.tar.bz2 725106
diff --git a/mail-filter/bogofilter/files/digest-bogofilter-0.96.2 b/mail-filter/bogofilter/files/digest-bogofilter-0.96.2
deleted file mode 100644
index 8b5f0fca5335..000000000000
--- a/mail-filter/bogofilter/files/digest-bogofilter-0.96.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 30b66f7cf0abfb3dbd51ad07894e3505 bogofilter-0.96.2.tar.bz2 722557
diff --git a/mail-filter/bogofilter/files/digest-bogofilter-0.96.5 b/mail-filter/bogofilter/files/digest-bogofilter-0.96.5
new file mode 100644
index 000000000000..39583a84d67e
--- /dev/null
+++ b/mail-filter/bogofilter/files/digest-bogofilter-0.96.5
@@ -0,0 +1 @@
+MD5 77ec9fc84f51a183800a615b59c97da8 bogofilter-0.96.5.tar.bz2 745804