From: Mark Loeser <halcy0n@gentoo.org>
Date: Thu, 16 Mar 2006 06:01:29 +0000 (+0000)
Subject: Add patch to fix compilation with gcc-4.1; bug #125347
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=92129cfc9db05a44e9bd50b0eb5e01db5b5a93a5;p=gentoo.git

Add patch to fix compilation with gcc-4.1; bug #125347
Package-Manager: portage-2.1_pre6-r3
---

diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index 9ba3aa90b3a4..c7c3119388cd 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamprobe
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.15 2006/02/19 18:55:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.16 2006/03/16 06:01:28 halcy0n Exp $
+
+  16 Mar 2006; Mark Loeser <halcy0n@gentoo.org>
+  +files/spamprobe-1.4b-gcc41.patch, spamprobe-1.4b.ebuild:
+  Add patch to fix compilation with gcc-4.1; bug #125347
 
 *spamprobe-1.4b (19 Feb 2006)
 
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 2397427f4331..0d7f0774ae94 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 9e6f4537f752a9b422edaf0e33ce09a8 ChangeLog 2246
-RMD160 2a4365d67af2243a500a1686201f8ba30bdf3d82 ChangeLog 2246
-SHA256 089839011d506bae3a5edcadc66a68dfb60be80fd0b24dee15cbea73a12fcad9 ChangeLog 2246
+MD5 3b56009c49ed7f7d9d4d5224f61b3bd5 ChangeLog 2414
+RMD160 015beefd1656149ca79dfc7f37aae779a9090458 ChangeLog 2414
+SHA256 fdd6fb7b77d1815aabb168075aa3fad0bc64e76d9967b4dd12e03d19c66d7045 ChangeLog 2414
 MD5 3e2a7aa9ae39974be42efa119ee86ca2 files/digest-spamprobe-1.0a 66
 RMD160 fb252123c7902f97266580c48f3d201a18e7699c files/digest-spamprobe-1.0a 66
 SHA256 70bdaa2d03c1ea8d3808b183d8cba8de3fb8ad331afbb9d1aef8e74646223db4 files/digest-spamprobe-1.0a 66
@@ -19,9 +19,12 @@ SHA256 f03d630acbc065b55c514c1179b21d3285ad06ee81629cb8285a617a402acf34 files/di
 MD5 c95f74e0e80dfdf4979b7101a7668402 files/digest-spamprobe-1.4a 244
 RMD160 6f03c50d87bab24295c74abab5d033a9de6d43fe files/digest-spamprobe-1.4a 244
 SHA256 9735b136d45197b5803b5e4db5a8ff8b1644541ccc1fab92ff670dc2ae21eb8d files/digest-spamprobe-1.4a 244
-MD5 cbeb7d5bd9db0316da09d058352eb3d9 files/digest-spamprobe-1.4b 244
-RMD160 5ca53a9cdf976dcab8dc62f414b9cbe2f84d5509 files/digest-spamprobe-1.4b 244
-SHA256 6da525c4c0c278b25584100214c7a0a5c41e91dfa582b22bc6d8c1cf8fe4987e files/digest-spamprobe-1.4b 244
+MD5 14b719b235cb39d3ca25e869ae360ab8 files/digest-spamprobe-1.4b 244
+RMD160 f3d8e35039b9458169bce418898e931526a4f881 files/digest-spamprobe-1.4b 244
+SHA256 9a93f23fc79b5c3d3c8043acb7a695a3dd9da3071ba9ff7be1cafb45a85767e7 files/digest-spamprobe-1.4b 244
+MD5 3432a84753cb3ff03ba8685ec2abc264 files/spamprobe-1.4b-gcc41.patch 383
+RMD160 0422df9bf43fd510fe320b3617a9f0359da02dd9 files/spamprobe-1.4b-gcc41.patch 383
+SHA256 998b00e4fb1e4ad214baa7609cf9f9bb9732678d0fa444c4a352ca395c163a92 files/spamprobe-1.4b-gcc41.patch 383
 MD5 7a63986c893466830ff3fb3aad7f89fa metadata.xml 251
 RMD160 fe636c5fe7e6050829285b0af3d05793a7bd210c metadata.xml 251
 SHA256 01e22d563319856b8f2ad43bab5d9cb66de405ebfd186277b0c97253216359be metadata.xml 251
@@ -40,13 +43,13 @@ SHA256 a11f71a6c226b85f1ca7cfd80cf0d32ac24c57db441886d13af85ef44ea70b71 spamprob
 MD5 ba277001c8ed05d1ff6ce62a4d621ab4 spamprobe-1.4a.ebuild 803
 RMD160 b4e3132352fdcdfbd0ac7904578f570ced0a1b1c spamprobe-1.4a.ebuild 803
 SHA256 ca61c6048eec2b91981967bbdf552df7084051ffddb5d4fa3847f0cd470c0e87 spamprobe-1.4a.ebuild 803
-MD5 13ffa6a0cdd9aefa03545b085a676c42 spamprobe-1.4b.ebuild 803
-RMD160 8b6f5f8ab3e351fc6a66cb94fc431d6c160d567a spamprobe-1.4b.ebuild 803
-SHA256 221d05f1738beee0a69bc22afb783fecaab164aa8ed0b17cb69c247fdd05c253 spamprobe-1.4b.ebuild 803
+MD5 26d90f0966fbdc05e7787470038cbaa9 spamprobe-1.4b.ebuild 872
+RMD160 5528545e45f9ed869e646acf7aa4332d75b46a20 spamprobe-1.4b.ebuild 872
+SHA256 426f09bfa79e8c8dcc0f0aae68e8518ab0c07552f0c891b678f130fb27a6c766 spamprobe-1.4b.ebuild 872
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
+Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFD+L81QlM6RnzZP+IRAjmSAKC+kDCmreyAaKEcM3Lyrjtd6rEP1ACglFVq
-SVTazNksT4EdRpThQkKTxP0=
-=slMc
+iD8DBQFEGP9HCRZPokWLroQRAh5XAKDSsVMxjj2tjFhw8l9zNIQH17Vl1gCfVRWr
+0CnDIsedwu2jKN5KWGymKpc=
+=OMGu
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/files/digest-spamprobe-1.4b b/mail-filter/spamprobe/files/digest-spamprobe-1.4b
index f70e4f40c37e..5f35e35955d6 100644
--- a/mail-filter/spamprobe/files/digest-spamprobe-1.4b
+++ b/mail-filter/spamprobe/files/digest-spamprobe-1.4b
@@ -1,3 +1,3 @@
-MD5 735a5ef084ca09a39fb88a0334fcc68e spamprobe-1.4b.tar.gz 255023
 RMD160 e3d08b6ea4eb603f4341b9c683a2092db3ba3aa5 spamprobe-1.4b.tar.gz 255023
 SHA256 fe6e5e69c4902850acabbb5ff81fc48c31b8450834d378875be522d51d91e21e spamprobe-1.4b.tar.gz 255023
+MD5 735a5ef084ca09a39fb88a0334fcc68e spamprobe-1.4b.tar.gz 255023
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch b/mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch
new file mode 100644
index 000000000000..b5c7225215f1
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4b-gcc41.patch
@@ -0,0 +1,12 @@
+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/spamprobe-1.4b.ebuild b/mail-filter/spamprobe/spamprobe-1.4b.ebuild
index 897037f9bf0a..fa8f650e0a93 100644
--- a/mail-filter/spamprobe/spamprobe-1.4b.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4b.ebuild
@@ -1,6 +1,8 @@
 # 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.4b.ebuild,v 1.1 2006/02/19 18:55:34 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4b.ebuild,v 1.2 2006/03/16 06:01:28 halcy0n Exp $
+
+inherit eutils
 
 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/"
@@ -11,8 +13,13 @@ SLOT="0"
 KEYWORDS="~ppc ~x86"
 
 IUSE="berkdb"
-DEPEND="berkdb? ( >=sys-libs/db-3.2 )
-	sys-devel/autoconf"
+DEPEND="berkdb? ( >=sys-libs/db-3.2 )"
+
+src_unpack() {
+	unpack ${A}
+
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+}
 
 src_compile() {
 	econf || die "econf failed"