Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-filter/bogofilter/, mail-filter/bogofilter/files/
Date: Sun, 21 Oct 2018 09:45:16
Message-Id: 1540115095.31f964fa027019c0e51068629c80c60450f3dcfb.johu@gentoo
1 commit: 31f964fa027019c0e51068629c80c60450f3dcfb
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 21 09:43:54 2018 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 21 09:44:55 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f964fa
7
8 mail-filter/bogofilter: Remove 1.2.4-r1
9
10 Overshadowed by 1.2.4-r2.
11
12 Signed-off-by: Johannes Huber <johu <AT> gentoo.org>
13 Package-Manager: Portage-2.3.51, Repoman-2.3.11
14
15 mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild | 126 ---------------------
16 .../bogofilter/files/bogofilter-1.2.2-gcc34.patch | 24 ----
17 2 files changed, 150 deletions(-)
18
19 diff --git a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild b/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
20 deleted file mode 100644
21 index 5ccb2b340a5..00000000000
22 --- a/mail-filter/bogofilter/bogofilter-1.2.4-r1.ebuild
23 +++ /dev/null
24 @@ -1,126 +0,0 @@
25 -# Copyright 1999-2016 Gentoo Foundation
26 -# Distributed under the terms of the GNU General Public License v2
27 -
28 -EAPI=5
29 -
30 -inherit autotools db-use eutils flag-o-matic toolchain-funcs
31 -
32 -DESCRIPTION="Bayesian spam filter designed with fast algorithms, and tuned for speed"
33 -HOMEPAGE="http://bogofilter.sourceforge.net/"
34 -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
35 -
36 -LICENSE="GPL-2"
37 -SLOT="0"
38 -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
39 -IUSE="berkdb sqlite tokyocabinet"
40 -
41 -DEPEND="
42 - virtual/libiconv
43 - berkdb? ( >=sys-libs/db-3.2:* )
44 - !berkdb? (
45 - sqlite? ( >=dev-db/sqlite-3.6.22 )
46 - !sqlite? (
47 - tokyocabinet? ( dev-db/tokyocabinet )
48 - !tokyocabinet? ( >=sys-libs/db-3.2:* )
49 - )
50 - )
51 - sci-libs/gsl:=
52 - app-arch/pax"
53 -# pax needed for bf_tar
54 -RDEPEND="${DEPEND}"
55 -
56 -pkg_setup() {
57 - has_version mail-filter/bogofilter || return 0
58 - if ( use berkdb && ! has_version 'mail-filter/bogofilter[berkdb]' ) || \
59 - ( ! use berkdb && has_version 'mail-filter/bogofilter[berkdb]' ) || \
60 - ( use sqlite && ! has_version 'mail-filter/bogofilter[sqlite]' ) || \
61 - ( ! use sqlite && has_version 'mail-filter/bogofilter[sqlite]' ) || \
62 - ( has_version '>=mail-filter/bogofilter-1.2.1-r1' && \
63 - ( use tokyocabinet && ! has_version 'mail-filter/bogofilter[tokyocabinet]' ) || \
64 - ( ! use tokyocabinet && has_version 'mail-filter/bogofilter[tokyocabinet]' )
65 - ) ; then
66 - ewarn
67 - ewarn "If you want to switch the database backend, you must dump the wordlist"
68 - ewarn "with the current version (old use flags) and load it with the new version!"
69 - ewarn
70 - fi
71 -}
72 -
73 -src_prepare() {
74 - # bug 445918
75 - sed -i -e 's/ -ggdb//' configure.ac || die
76 -
77 - # bug 421747
78 - epatch "${FILESDIR}"/${P}-test-env.patch
79 - chmod +x src/tests/t.{ctype,leakfind,lexer.qpcr,lexer.eoh,message_id,queue_id}
80 -
81 - eautoreconf
82 -}
83 -
84 -src_configure() {
85 - local myconf="" berkdb=true
86 - myconf="--without-included-gsl"
87 -
88 - # determine backend: berkdb *is* default
89 - if use berkdb && use sqlite ; then
90 - elog "Both useflags berkdb and sqlite are in USE:"
91 - elog "Using berkdb as database backend."
92 - elif use berkdb && use tokyocabinet ; then
93 - elog "Both useflags berkdb and tokyocabinet are in USE:"
94 - elog "Using berkdb as database backend."
95 - elif use sqlite && use tokyocabinet ; then
96 - elog "Both useflags sqlite and tokyocabinet are in USE:"
97 - elog "Using sqlite as database backend."
98 - myconf="${myconf} --with-database=sqlite"
99 - berkdb=false
100 - elif use sqlite ; then
101 - myconf="${myconf} --with-database=sqlite"
102 - berkdb=false
103 - elif use tokyocabinet ; then
104 - myconf="${myconf} --with-database=tokyocabinet"
105 - berkdb=false
106 - elif ! use berkdb ; then
107 - elog "Neither berkdb nor sqlite nor tokyocabinet are in USE:"
108 - elog "Using berkdb as database backend."
109 - fi
110 -
111 - # Include the right berkdb headers for FreeBSD
112 - if ${berkdb} ; then
113 - append-cppflags "-I$(db_includedir)"
114 - fi
115 -
116 - # bug #324405
117 - if [[ $(gcc-version) == "3.4" ]] ; then
118 - epatch "${FILESDIR}"/${PN}-1.2.2-gcc34.patch
119 - fi
120 -
121 - econf ${myconf}
122 -}
123 -
124 -src_test() {
125 - emake -C src/ check
126 -}
127 -
128 -src_install() {
129 - emake DESTDIR="${D}" install
130 -
131 - exeinto /usr/share/${PN}/contrib
132 - doexe contrib/{bogofilter-qfe,parmtest,randomtrain}.sh \
133 - contrib/{bfproxy,bogominitrain,mime.get.rfc822,printmaildir}.pl \
134 - contrib/{spamitarium,stripsearch}.pl
135 -
136 - insinto /usr/share/${PN}/contrib
137 - doins contrib/{README.*,dot-qmail-bogofilter-default} \
138 - contrib/{bogogrep.c,bogo.R,bogofilter-milter.pl,*.example} \
139 - contrib/vm-bogofilter.el \
140 - contrib/{trainbogo,scramble}.sh
141 -
142 - dodoc AUTHORS NEWS README RELEASE.NOTES* TODO GETTING.STARTED \
143 - doc/integrating-with-* doc/README.{db,sqlite}
144 -
145 - dohtml doc/*.html
146 -
147 - dodir /usr/share/doc/${PF}/samples
148 - mv "${D}"/etc/bogofilter.cf.example "${D}"/usr/share/doc/${PF}/samples/ || die
149 - rmdir "${D}"/etc || die
150 -}
151
152 diff --git a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch b/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
153 deleted file mode 100644
154 index 80e4d787cf8..00000000000
155 --- a/mail-filter/bogofilter/files/bogofilter-1.2.2-gcc34.patch
156 +++ /dev/null
157 @@ -1,24 +0,0 @@
158 -diff -ruN bogofilter-1.2.1-orig/src/Makefile.am bogofilter-1.2.1/src/Makefile.am
159 ---- bogofilter-1.2.1-orig/src/Makefile.am 2009-05-28 22:59:05.000000000 +0200
160 -+++ bogofilter-1.2.1/src/Makefile.am 2010-06-16 22:52:36.000000000 +0200
161 -@@ -16,7 +16,7 @@
162 - AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
163 - -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
164 - else
165 --AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
166 -+AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
167 - -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
168 - endif
169 -
170 -diff -ruN bogofilter-1.2.1-orig/src/Makefile.in bogofilter-1.2.1/src/Makefile.in
171 ---- bogofilter-1.2.1-orig/src/Makefile.in 2009-08-01 21:00:51.000000000 +0200
172 -+++ bogofilter-1.2.1/src/Makefile.in 2010-06-16 22:52:23.000000000 +0200
173 -@@ -483,7 +483,7 @@
174 - @ENABLE_MEMDEBUG_TRUE@MEMDEBUG_SRC = memdebug.c memdebug.h
175 - noinst_LIBRARIES = libbogofilter.a $(am__append_3) $(am__append_5) \
176 - $(am__append_10)
177 --@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I- -I. \
178 -+@USE_GCC4_FALSE@AM_CPPFLAGS = -I$(top_srcdir)/gnugetopt -I$(top_srcdir)/trio -I. \
179 - @USE_GCC4_FALSE@ -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
180 -
181 - @USE_GCC4_TRUE@AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \