johu        14/04/10 20:28:04

  Modified:             ChangeLog
  Added:                bogofilter-1.2.4-r1.ebuild
  Log:
  Revision bump fixes tests by Jeroen Roovers <j...@gentoo.org>, bug #421747.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 
F3CFD2BD)

Revision  Changes    Path
1.153                mail-filter/bogofilter/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/bogofilter/ChangeLog?rev=1.153&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/bogofilter/ChangeLog?rev=1.153&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/bogofilter/ChangeLog?r1=1.152&r2=1.153

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog   10 Apr 2014 16:16:13 -0000      1.152
+++ ChangeLog   10 Apr 2014 20:28:04 -0000      1.153
@@ -1,6 +1,12 @@
 # ChangeLog for mail-filter/bogofilter
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.152 
2014/04/10 16:16:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/bogofilter/ChangeLog,v 1.153 
2014/04/10 20:28:04 johu Exp $
+
+*bogofilter-1.2.4-r1 (10 Apr 2014)
+
+  10 Apr 2014; Johannes Huber <j...@gentoo.org> +bogofilter-1.2.4-r1.ebuild,
+  +files/bogofilter-1.2.4-test-env.patch:
+  Revision bump fixes tests by Jeroen Roovers <j...@gentoo.org>, bug #421747.
 
   10 Apr 2014; Jeroen Roovers <j...@gentoo.org> bogofilter-1.2.4.ebuild:
   Stable for HPPA (bug #506822).



1.1                  mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: bogofilter-1.2.4-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: 
/var/cvsroot/gentoo-x86/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild,v 1.1 
2014/04/10 20:28:04 johu Exp $

EAPI=5
inherit autotools db-use eutils flag-o-matic toolchain-funcs

DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for 
speed."
HOMEPAGE="http://bogofilter.sourceforge.net/";
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="berkdb sqlite tokyocabinet"

DEPEND="virtual/libiconv
        berkdb?  ( >=sys-libs/db-3.2 )
        !berkdb? (
                sqlite?  ( >=dev-db/sqlite-3.6.22 )
                !sqlite? (
                        tokyocabinet? ( dev-db/tokyocabinet )
                        !tokyocabinet? ( >=sys-libs/db-3.2 )
                )
        )
        sci-libs/gsl
        app-arch/pax"
# pax needed for bf_tar
RDEPEND="${DEPEND}"

pkg_setup() {
        has_version mail-filter/bogofilter || return 0
        if  (   use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) 
|| \
                ( ! use berkdb &&   has_version 
'mail-filter/bogofilter[berkdb]' ) || \
                (   use sqlite && ! has_version 
'mail-filter/bogofilter[sqlite]' ) || \
                ( ! use sqlite &&   has_version 
'mail-filter/bogofilter[sqlite]' ) || \
                ( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
                        (   use tokyocabinet && ! has_version 
'mail-filter/bogofilter[tokyocabinet]' ) || \
                        ( ! use tokyocabinet &&   has_version 
'mail-filter/bogofilter[tokyocabinet]' )
                ) ; then
                ewarn
                ewarn "If you want to switch the database backend, you must 
dump the wordlist"
                ewarn "with the current version (old use flags) and load it 
with the new version!"
                ewarn
        fi
}

src_prepare() {
        # bug 445918
        sed -i -e 's/ -ggdb//' configure.ac || die

        # bug 421747
        epatch "${FILESDIR}"/${P}-test-env.patch
        chmod +x 
src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id}

        eautoreconf
}

src_configure() {
        local myconf="" berkdb=true
        myconf="--without-included-gsl"

        # determine backend: berkdb *is* default
        if use berkdb && use sqlite ; then
                elog "Both useflags berkdb and sqlite are in USE:"
                elog "Using berkdb as database backend."
        elif use berkdb && use tokyocabinet ; then
                elog "Both useflags berkdb and tokyocabinet are in USE:"
                elog "Using berkdb as database backend."
        elif use sqlite && use tokyocabinet ; then
                elog "Both useflags sqlite and tokyocabinet are in USE:"
                elog "Using sqlite as database backend."
                myconf="${myconf} --with-database=sqlite"
                berkdb=false
        elif use sqlite ; then
                myconf="${myconf} --with-database=sqlite"
                berkdb=false
        elif use tokyocabinet ; then
                myconf="${myconf} --with-database=tokyocabinet"
                berkdb=false
        elif ! use berkdb ; then
                elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
                elog "Using berkdb as database backend."
        fi

        # Include the right berkdb headers for FreeBSD
        if ${berkdb} ; then
                append-cppflags "-I$(db_includedir)"
        fi

        # bug #324405
        if [[ $(gcc-version) == "3.4" ]] ; then
                epatch "${FILESDIR}"/${PN}-1.2.2-gcc34.patch
        fi

        econf ${myconf}
}

src_test() {
        emake -C src/ check
}

src_install() {
        emake DESTDIR="${D}" install

        exeinto /usr/share/${PN}/contrib
        doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
                contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl 
\
                contrib/{spamitarium,stripsearch}.pl

        insinto /usr/share/${PN}/contrib
        doins contrib/{README.*,dot-qmail-bogofilter-default} \
                contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
                contrib/vm-bogofilter.el \
                contrib/{trainbogo,scramble}.sh

        dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
                doc/integrating-with-* doc/README.{db,sqlite}

        dohtml doc/*.html

        dodir /usr/share/doc/${PF}/samples
        mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/
        rmdir "${D}"/etc
}




Reply via email to