summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2011-01-10 20:17:38 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2011-01-10 20:17:38 +0000
commite981fa21f7ce44827624970f93340ee7406de5a4 (patch)
tree2226864779b47fe179685d323f7db53af724ccf2 /mail-filter/spamprobe
parentVersion bump. Fixes bug #350855 reported by Nickolaj Stjujsckij. (diff)
downloadhistorical-e981fa21f7ce44827624970f93340ee7406de5a4.tar.gz
historical-e981fa21f7ce44827624970f93340ee7406de5a4.tar.bz2
historical-e981fa21f7ce44827624970f93340ee7406de5a4.zip
Remove old version and fix build with berkdb 5.0 (bug #319941).
Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64
Diffstat (limited to 'mail-filter/spamprobe')
-rw-r--r--mail-filter/spamprobe/ChangeLog9
-rw-r--r--mail-filter/spamprobe/Manifest18
-rw-r--r--mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch12
-rw-r--r--mail-filter/spamprobe/files/spamprobe-1.4d+db-5.0.patch13
-rw-r--r--mail-filter/spamprobe/spamprobe-1.4b.ebuild35
-rw-r--r--mail-filter/spamprobe/spamprobe-1.4d.ebuild7
6 files changed, 37 insertions, 57 deletions
diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index e673ad0bf25b..8c7441762b3e 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for mail-filter/spamprobe
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.26 2010/03/08 17:34:40 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.27 2011/01/10 20:17:37 flameeyes Exp $
+
+ 10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org> -spamprobe-1.4b.ebuild,
+ -files/spamprobe-1.4b-gcc41.patch, spamprobe-1.4d.ebuild,
+ +files/spamprobe-1.4d+db-5.0.patch:
+ Remove old version and fix build with berkdb 5.0 (bug #319941).
08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> spamprobe-1.4d.ebuild,
+files/spamprobe-1.4d-libpng14.patch:
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 5081de767816..310d59665775 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,9 +1,17 @@
-AUX spamprobe-1.4b-gcc41.patch 383 RMD160 0422df9bf43fd510fe320b3617a9f0359da02dd9 SHA1 3d958885bf2fbc1de79260c1fcd9997bb3d4507d SHA256 998b00e4fb1e4ad214baa7609cf9f9bb9732678d0fa444c4a352ca395c163a92
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX spamprobe-1.4b-gcc43.patch 4002 RMD160 60c23abe7cddd388061e3446c6dd5d6f9bbeb9fd SHA1 fc061e29c442d83727e43da58f7b4b54dac5fd8c SHA256 61e1ba0b7c0046f77fe7c2e41c802ecb3873bd548ceb52e9ef0f4aa94a6e1993
+AUX spamprobe-1.4d+db-5.0.patch 768 RMD160 bcbbd3d11a7b2c7e41ce80e41f1ac695696d2eea SHA1 9975b08103c75110141d67135ab2c5042c5bc21d SHA256 787e0a16d712718ba97c9e7f23a62b966bda630c5ba8e8368876a92c959f2ac4
AUX spamprobe-1.4d-libpng14.patch 786 RMD160 6a1dba69d0a360137cfdf8479d3348e5fbd78705 SHA1 4e55e310f21dc3c7ecd02e0a38c197bae0158a00 SHA256 e999b5a6b55fbea6fd5a266450c2e664c72bbafd7bc92a2a5954d3fee55e1217
-DIST spamprobe-1.4b.tar.gz 255023 RMD160 e3d08b6ea4eb603f4341b9c683a2092db3ba3aa5 SHA1 a20a6c4a3ab831dd39b392c755170140d91cc372 SHA256 fe6e5e69c4902850acabbb5ff81fc48c31b8450834d378875be522d51d91e21e
DIST spamprobe-1.4d.tar.gz 262761 RMD160 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56 SHA1 fbcd65eb21097cd860d5e5ee2c4c2524c717a237 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68
-EBUILD spamprobe-1.4b.ebuild 817 RMD160 98f8c54e5bb2cf942f78d52cc31c7ba86bd16f3e SHA1 af97f2b5c4556bf7f5835dcf44e9ee160621ab12 SHA256 3b249d8ddfaacfbb6bb312fdd3a5b45c17e9ed73c5bd76e2bf74cd4fb54a3018
-EBUILD spamprobe-1.4d.ebuild 964 RMD160 a4dbd16062bba1af3981b7f47d76e4c88175c2da SHA1 0ed6312c8d7f9deac94ff8f522f5014e9788eeb3 SHA256 f0f04fe4f57922976db399d7e4756f9c863d16fce59778e10d70f4e5d24a008c
-MISC ChangeLog 3759 RMD160 44c40f11cef7a385905f90053bbc45d372f68441 SHA1 03222128a0b87d317a8f97b83ec48ae1c1681abd SHA256 f1795f10e7223ffeb38268d0aabf397402ae48e7127c38fabbf83984d06bfbd4
+EBUILD spamprobe-1.4d.ebuild 1000 RMD160 daf740c78802eb156981eff8d7df21a3b47d3c6d SHA1 3ab778bab0ccf89df7faefce1684882187523ac1 SHA256 1daefa031275cf8c6ee50c1ef6784adc7e01bc62ec1db98b56ae66d4e04fe780
+MISC ChangeLog 4004 RMD160 1b3ed497d79b2766e666298fa1492b2f8b44a2c7 SHA1 2bae8a0eab04f4acb84f0a88cb0fe8253609851e SHA256 1ec3a150356b412ba9dc9b26a6a25ce6af2230d87fd41f7dce839431e785fce4
MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0raUgACgkQAiZjviIA2XimlgCg49+GzoZRSSU6/quT6TmVMLhd
+XtsAoJ5K31ohEqsUWWRH30bI9bP++BVA
+=oPTe
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch b/mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch
deleted file mode 100644
index b5c7225215f1..000000000000
--- a/mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur spamprobe-1.4b-orig/src/includes/Buffer.h spamprobe-1.4b/src/includes/Buffer.h
---- spamprobe-1.4b-orig/src/includes/Buffer.h 2006-03-10 20:42:01.000000000 -0500
-+++ spamprobe-1.4b/src/includes/Buffer.h 2006-03-10 20:42:38.000000000 -0500
-@@ -32,6 +32,7 @@
- #define _Buffer_h
-
- #include "Array.h"
-+#include <cassert>
-
- //
- // Similar to Array but handles variable length.
-
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4d+db-5.0.patch b/mail-filter/spamprobe/files/spamprobe-1.4d+db-5.0.patch
new file mode 100644
index 000000000000..5ea5db04fff1
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4d+db-5.0.patch
@@ -0,0 +1,13 @@
+Index: spamprobe-1.4d/src/database/FrequencyDBImpl_bdb.cc
+===================================================================
+--- spamprobe-1.4d.orig/src/database/FrequencyDBImpl_bdb.cc
++++ spamprobe-1.4d/src/database/FrequencyDBImpl_bdb.cc
+@@ -155,7 +155,7 @@ bool FrequencyDBImpl_bdb::openDatabase(c
+ // hideous ifdefs into my code.
+ string filename(m_env ? db_file.getName() : db_file.getPath());
+ int flags = read_only ? DB_RDONLY : DB_CREATE;
+-#if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1
++#if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5
+ ret = m_file->open(m_file, NULL, filename.c_str(), NULL, DB_BTREE, flags, create_mode);
+ #else
+ ret = m_file->open(m_file, filename.c_str(), NULL, DB_BTREE, flags, create_mode);
diff --git a/mail-filter/spamprobe/spamprobe-1.4b.ebuild b/mail-filter/spamprobe/spamprobe-1.4b.ebuild
deleted file mode 100644
index e599a2b48a71..000000000000
--- a/mail-filter/spamprobe/spamprobe-1.4b.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4b.ebuild,v 1.5 2008/04/28 16:44:38 ticho Exp $
-
-inherit eutils
-
-DESCRIPTION="Fast, intelligent, automatic spam detector using Bayesian analysis."
-HOMEPAGE="http://spamprobe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-
-IUSE="berkdb"
-DEPEND="berkdb? ( >=sys-libs/db-3.2 )"
-
-src_unpack() {
- unpack ${A}
-
- epatch "${FILESDIR}"/${P}-gcc41.patch
-}
-
-src_compile() {
- econf || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- dodoc README.txt ChangeLog LICENSE.txt
- make DESTDIR="${D}" install || die
-
- insinto /usr/share/${PN}/contrib
- doins contrib/*
-}
diff --git a/mail-filter/spamprobe/spamprobe-1.4d.ebuild b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
index cbeb98c17d81..80a33b0fe524 100644
--- a/mail-filter/spamprobe/spamprobe-1.4d.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.5 2010/03/08 17:34:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.6 2011/01/10 20:17:37 flameeyes Exp $
EAPI=2
inherit eutils
@@ -21,7 +21,8 @@ DEPEND="berkdb? ( >=sys-libs/db-3.2 )
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.4b-gcc43.patch \
- "${FILESDIR}"/${P}-libpng14.patch
+ "${FILESDIR}"/${P}-libpng14.patch \
+ "${FILESDIR}"/${P}+db-5.0.patch
}
src_configure() {