commit: 31f964fa027019c0e51068629c80c60450f3dcfb Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sun Oct 21 09:43:54 2018 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun Oct 21 09:44:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f964fa
mail-filter/bogofilter: Remove 1.2.4-r1 Overshadowed by 1.2.4-r2. Signed-off-by: Johannes Huber <johu <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild | 126 --------------------- .../bogofilter/files/bogofilter-1.2.2-gcc34.patch | 24 ---- 2 files changed, 150 deletions(-) diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild deleted file mode 100644 index 5ccb2b340a5..00000000000 --- a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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/ || die - rmdir "${D}"/etc || die -} diff --git a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch b/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch deleted file mode 100644 index 80e4d787cf8..00000000000 --- a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN bogofilter-1.2.1-orig/src/Makefile.am bogofilter-1.2.1/src/Makefile.am ---- bogofilter-1.2.1-orig/src/Makefile.am 2009-05-28 22:59:05.000000000 +0200 -+++ bogofilter-1.2.1/src/Makefile.am 2010-06-16 22:52:36.000000000 +0200 -@@ -16,7 +16,7 @@ - AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \ - -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir) - else --AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \ -+AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \ - -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir) - endif - -diff -ruN bogofilter-1.2.1-orig/src/Makefile.in bogofilter-1.2.1/src/Makefile.in ---- bogofilter-1.2.1-orig/src/Makefile.in 2009-08-01 21:00:51.000000000 +0200 -+++ bogofilter-1.2.1/src/Makefile.in 2010-06-16 22:52:23.000000000 +0200 -@@ -483,7 +483,7 @@ - @ENABLE_MEMDEBUG_TRUE@MEMDEBUG_SRC = memdebug.c memdebug.h - noinst_LIBRARIES = libbogofilter.a $(am__append_3) $(am__append_5) \ - $(am__append_10) --@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \ -+@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \ - @USE_GCC4_FALSE@ -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir) - - @USE_GCC4_TRUE@AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
