summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrej Kacian <ticho@gentoo.org>2008-04-28 16:44:39 +0000
committerAndrej Kacian <ticho@gentoo.org>2008-04-28 16:44:39 +0000
commit9f3c3a9612a4327a4b92f2274c304f110e042519 (patch)
tree81b3a30da4c8edc0890d1aa33e8bdf3139c126d8 /mail-filter/spamprobe
parentVersion bump wrt #219508, thanks to Andrew Smith. (diff)
downloadhistorical-9f3c3a9612a4327a4b92f2274c304f110e042519.tar.gz
historical-9f3c3a9612a4327a4b92f2274c304f110e042519.tar.bz2
historical-9f3c3a9612a4327a4b92f2274c304f110e042519.zip
Add patch to fix building on gcc4.3, bug #219552 by Peter Alfredsen. Remove old ebuild.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'mail-filter/spamprobe')
-rw-r--r--mail-filter/spamprobe/ChangeLog10
-rw-r--r--mail-filter/spamprobe/Manifest19
-rw-r--r--mail-filter/spamprobe/files/spamprobe-1.4b-gcc43.patch150
-rw-r--r--mail-filter/spamprobe/spamprobe-1.4a.ebuild28
-rw-r--r--mail-filter/spamprobe/spamprobe-1.4b.ebuild8
-rw-r--r--mail-filter/spamprobe/spamprobe-1.4d.ebuild14
6 files changed, 186 insertions, 43 deletions
diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index 6b86bde1da50..bf46cd080141 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for mail-filter/spamprobe
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.21 2007/02/22 01:03:37 peper Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.22 2008/04/28 16:44:38 ticho Exp $
+
+ 28 Apr 2008; Andrej Kacian <ticho@gentoo.org>
+ +files/spamprobe-1.4b-gcc43.patch, -spamprobe-1.4a.ebuild,
+ spamprobe-1.4d.ebuild:
+ Add patch to fix building on gcc4.3, bug #219552 by Peter Alfredsen.
+ Remove old ebuild.
22 Feb 2007; Piotr JaroszyƄski <peper@gentoo.org> ChangeLog:
Transition to Manifest2.
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 974e5bbd186f..22aed93f605b 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,9 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX spamprobe-1.4b-gcc41.patch 383 RMD160 0422df9bf43fd510fe320b3617a9f0359da02dd9 SHA1 3d958885bf2fbc1de79260c1fcd9997bb3d4507d SHA256 998b00e4fb1e4ad214baa7609cf9f9bb9732678d0fa444c4a352ca395c163a92
-DIST spamprobe-1.4a.tar.gz 254812 RMD160 667c68b85ff1ea8d61581be000e70334cf5af57d SHA1 1caab7e5df469761789470a6a5c04f4f64f653f5 SHA256 4f736038cdd79a4395fb2314d291060d6b64e8a68356a8dc26eaf22c609f22b3
+AUX spamprobe-1.4b-gcc43.patch 4002 RMD160 60c23abe7cddd388061e3446c6dd5d6f9bbeb9fd SHA1 fc061e29c442d83727e43da58f7b4b54dac5fd8c SHA256 61e1ba0b7c0046f77fe7c2e41c802ecb3873bd548ceb52e9ef0f4aa94a6e1993
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.4a.ebuild 802 RMD160 dc9639c518e8b82f4ae3007eea27d90cb900e87f SHA1 7ddf5a44edd02121e3713ad58dc860583764ab05 SHA256 bcf7113ba89cc5847ee042364287b6a4ce4803f763fe33062ed1447f233b8c8f
-EBUILD spamprobe-1.4b.ebuild 877 RMD160 572e16acde0484ed1f4a7baf818087cf29cb6c78 SHA1 0aa30600e17e92e6456e8fbb7a238ec2331ac1f3 SHA256 869882a6887c574f369a6ef5de5c2ddcb6f9aa10bde3b70eaf270e6c2edb97ce
-EBUILD spamprobe-1.4d.ebuild 972 RMD160 e4f2ea0e5ff0d3e9c5c793d277672c6c6c611c1a SHA1 02f020a699678fc5bc5799dafca865229490b257 SHA256 8a4a30cb416a79a40bc5a7e4563bb46711d3261d059128c1fcb5793475d902f4
-MISC ChangeLog 3022 RMD160 b41629a908a37e1504691f92d81573a88b10597e SHA1 295d3c5a093f26b43ca2b097ffa27f6d4fde2606 SHA256 83f591ad5842bcbae34cb29b2c8c2bbd44e95d5904280dff65ac86d71310935b
+EBUILD spamprobe-1.4b.ebuild 817 RMD160 98f8c54e5bb2cf942f78d52cc31c7ba86bd16f3e SHA1 af97f2b5c4556bf7f5835dcf44e9ee160621ab12 SHA256 3b249d8ddfaacfbb6bb312fdd3a5b45c17e9ed73c5bd76e2bf74cd4fb54a3018
+EBUILD spamprobe-1.4d.ebuild 994 RMD160 79bcff00eae6c8ff19c2d40885f5747d35a71a84 SHA1 79470f13322e9d404f17e4569e42fb799145be9c SHA256 420c0a99000aafd6031495f31e88b76cbb2e07f058c5c37f5ec5eac2cf79a6cb
+MISC ChangeLog 3249 RMD160 50c0e73b5bfbf7c0db53b6833b2d86b0bf554896 SHA1 ae3ec54f97c047bbc1a7e2aa6444a2ec2546e084 SHA256 07b9aa1ea11dff68803913898d08e36205868173f53e2728b52b2d6a1cbc80f7
MISC metadata.xml 251 RMD160 fe636c5fe7e6050829285b0af3d05793a7bd210c SHA1 cea85effb798f32358ff97866b686aa49e672170 SHA256 01e22d563319856b8f2ad43bab5d9cb66de405ebfd186277b0c97253216359be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIFf8AQlM6RnzZP+IRAha3AKCJdGwCaIn3xBgLGWs4Phk/xPIQqwCdHONI
+CUvtLhjEW84uepL6sdQ6wT4=
+=nyDX
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4b-gcc43.patch b/mail-filter/spamprobe/files/spamprobe-1.4b-gcc43.patch
new file mode 100644
index 000000000000..097c5584a816
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4b-gcc43.patch
@@ -0,0 +1,150 @@
+--- spamprobe-1.4d.orig/src/spamprobe/Command_exec.cc
++++ spamprobe-1.4d/src/spamprobe/Command_exec.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "SpamFilter.h"
+ #include "CommandConfig.h"
+ #include "ConfigManager.h"
+--- spamprobe-1.4d.orig/src/spamprobe/Command_edit_term.cc
++++ spamprobe-1.4d/src/spamprobe/Command_edit_term.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "SpamFilter.h"
+ #include "FrequencyDB.h"
+ #include "CommandConfig.h"
+--- spamprobe-1.4d.orig/src/spamprobe/Command_cleanup.cc
++++ spamprobe-1.4d/src/spamprobe/Command_cleanup.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "CleanupManager.h"
+ #include "SpamFilter.h"
+ #include "FrequencyDB.h"
+--- spamprobe-1.4d.orig/src/spamprobe/spamprobe.cc
++++ spamprobe-1.4d/src/spamprobe/spamprobe.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include <unistd.h>
+ #include <locale.h>
+ #include <signal.h>
+--- spamprobe-1.4d.orig/src/spamprobe/Command_purge.cc
++++ spamprobe-1.4d/src/spamprobe/Command_purge.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "CleanupManager.h"
+ #include "SpamFilter.h"
+ #include "FrequencyDB.h"
+--- spamprobe-1.4d.orig/src/spamprobe/Command_import.cc
++++ spamprobe-1.4d/src/spamprobe/Command_import.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include <fstream>
+ #include "LineReader.h"
+ #include "IstreamCharReader.h"
+--- spamprobe-1.4d.orig/src/database/DatabaseConfig.cc
++++ spamprobe-1.4d/src/database/DatabaseConfig.cc
+@@ -29,6 +29,7 @@
+ //
+
+ #include <stdexcept>
++#include <cstdlib>
+ #include "File.h"
+ #include "WordData.h"
+ #include "FrequencyDBImpl.h"
+--- spamprobe-1.4d.orig/src/parser/MailMessageReader.cc
++++ spamprobe-1.4d/src/parser/MailMessageReader.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "RegularExpression.h"
+ #include "MailMessage.h"
+ #include "MailMessageList.h"
+--- spamprobe-1.4d.orig/src/parser/MbxMailMessageReader.cc
++++ spamprobe-1.4d/src/parser/MbxMailMessageReader.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include <stdexcept>
+ #include "MailMessage.h"
+ #include "MailMessageList.h"
+--- spamprobe-1.4d.orig/src/parser/AutoTrainMailMessageReader.cc
++++ spamprobe-1.4d/src/parser/AutoTrainMailMessageReader.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "MailMessage.h"
+ #include "AutoTrainMailMessageReader.h"
+
+--- spamprobe-1.4d.orig/src/parser/HtmlTokenizer.cc
++++ spamprobe-1.4d/src/parser/HtmlTokenizer.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "AbstractTokenReceiver.h"
+ #include "StringReader.h"
+ #include "RegularExpression.h"
+--- spamprobe-1.4d.orig/src/hdl/HdlTokenizer.cc
++++ spamprobe-1.4d/src/hdl/HdlTokenizer.cc
+@@ -28,6 +28,7 @@
+ // http://www.cooldevtools.com/qpl.html
+ //
+
++#include <cstdlib>
+ #include "AbstractCharReader.h"
+ #include "HdlError.h"
+ #include "HdlToken.h"
+--- spamprobe-1.4d.orig/src/includes/util.h
++++ spamprobe-1.4d/src/includes/util.h
+@@ -42,6 +42,7 @@
+ #include <cassert>
+ #include <iostream>
+ #include <cstdio>
++#include <cstring>
+ #include "Ptr.h"
+ #include "Ref.h"
+
+--- spamprobe-1.4d.orig/src/includes/MultiLineSubString.h
++++ spamprobe-1.4d/src/includes/MultiLineSubString.h
+@@ -31,6 +31,7 @@
+ #ifndef _MultiLineSubString_h
+ #define _MultiLineSubString_h
+
++#include <climits>
+ #include "AbstractMultiLineString.h"
+
+ class MultiLineSubString : public AbstractMultiLineString
+--- spamprobe-1.4d.orig/src/includes/Buffer.h
++++ spamprobe-1.4d/src/includes/Buffer.h
+@@ -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/spamprobe-1.4a.ebuild b/mail-filter/spamprobe/spamprobe-1.4a.ebuild
deleted file mode 100644
index e4bd58308743..000000000000
--- a/mail-filter/spamprobe/spamprobe-1.4a.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4a.ebuild,v 1.2 2006/03/18 19:27:46 ticho Exp $
-
-DESCRIPTION="Fast, intelligent, automatic spam detector using Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
-HOMEPAGE="http://spamprobe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="QPL"
-SLOT="0"
-KEYWORDS="~ppc x86"
-
-IUSE="berkdb"
-DEPEND="berkdb? ( >=sys-libs/db-3.2 )
- sys-devel/autoconf"
-
-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.4b.ebuild b/mail-filter/spamprobe/spamprobe-1.4b.ebuild
index 64bc7677962b..e599a2b48a71 100644
--- a/mail-filter/spamprobe/spamprobe-1.4b.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4b.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.4 2006/04/20 18:11:17 slarti Exp $
+# $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 Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
+DESCRIPTION="Fast, intelligent, automatic spam detector using Bayesian analysis."
HOMEPAGE="http://spamprobe.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -28,7 +28,7 @@ src_compile() {
src_install() {
dodoc README.txt ChangeLog LICENSE.txt
- make DESTDIR=${D} install || die
+ 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 2a09d744b252..26cb39a48d5b 100644
--- a/mail-filter/spamprobe/spamprobe-1.4d.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4d.ebuild,v 1.1 2007/01/06 20:56:59 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.2 2008/04/28 16:44:38 ticho Exp $
inherit eutils
-DESCRIPTION="Fast, intelligent, automatic spam detector using Paul Graham style Bayesian analysis of word counts in spam and non-spam emails."
+DESCRIPTION="Fast, intelligent, automatic spam detector using Bayesian analysis."
HOMEPAGE="http://spamprobe.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -18,6 +18,12 @@ DEPEND="berkdb? ( >=sys-libs/db-3.2 )
jpeg? ( media-libs/jpeg )
png? ( media-libs/libpng )"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+}
+
src_compile() {
econf \
$(use_with gif) \
@@ -29,7 +35,7 @@ src_compile() {
src_install() {
dodoc README.txt ChangeLog LICENSE.txt
- emake DESTDIR=${D} install || die
+ emake DESTDIR="${D}" install || die
insinto /usr/share/${PN}/contrib
doins contrib/*