Fix build with GCC 4.7 (bug #421769).

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 60 insertions, 12 deletions

diff --git a/mail-filter/spamprobe/ChangeLog b/mail-filter/spamprobe/ChangeLog
index da22db8963e4..d71e900ec2c7 100644
--- a/mail-filter/spamprobe/ChangeLog
+++ b/mail-filter/spamprobe/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/spamprobe
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.28 2011/02/26 17:05:15 signals Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/ChangeLog,v 1.29 2013/02/19 17:26:44 dirtyepic Exp $
+
+  19 Feb 2013; Ryan Hill <dirtyepic@gentoo.org> spamprobe-1.4d.ebuild,
+  +files/spamprobe-1.4d-gcc47.patch:
+  Fix build with GCC 4.7 (bug #421769).
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> spamprobe-1.4d.ebuild:
   Updated depends from media-libs/jpeg to virtual/jpeg
diff --git a/mail-filter/spamprobe/Manifest b/mail-filter/spamprobe/Manifest
index 5aff628330a9..0b8172538bbc 100644
--- a/mail-filter/spamprobe/Manifest
+++ b/mail-filter/spamprobe/Manifest
@@ -1,7 +1,22 @@
-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.4d.tar.gz 262761 RMD160 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56 SHA1 fbcd65eb21097cd860d5e5ee2c4c2524c717a237 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68
-EBUILD spamprobe-1.4d.ebuild 993 RMD160 163da0d98b54389e9e4df4e26acd78396f35eb79 SHA1 4f22b7575fb2d720e4813560abf94feb78500c86 SHA256 d484ccb049edb88100e812c2b9e42c6e1a2c46d723bfeca820ea208877f0bb44
-MISC ChangeLog 4132 RMD160 82d0419e0b595356c70475db3b5614be82b1a3f9 SHA1 f68c54e9b8e800ef7f988ca823e0e24b329c9f13 SHA256 626a18bc3ad09b12cfafa53f2f6f984e2cdac2d67e9391b44ac8ad66bc7840e8
-MISC metadata.xml 162 RMD160 fd38b82541901b3c6df18b630d79fe7883ae3f01 SHA1 e6aecefcc2137d6047cedfe447686775ab59cb48 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX spamprobe-1.4b-gcc43.patch 4002 SHA256 61e1ba0b7c0046f77fe7c2e41c802ecb3873bd548ceb52e9ef0f4aa94a6e1993 SHA512 4ae363124ced22ee9c1b6fba934cb320e491230e5b553bbcb13d20b2ff07e5c554be78088017f1e3f88ed0c5189a5055c136d0d5cfdb467cce3318b65ef8f775 WHIRLPOOL 4e5a0e6b98347027cd86ab9f5e6f6d7453ad5da69964f180edca941878d4eb9c298024528994fb2403e4d14fa575f09ac906bfad8a37e1b28841502840a9782b
+AUX spamprobe-1.4d+db-5.0.patch 768 SHA256 787e0a16d712718ba97c9e7f23a62b966bda630c5ba8e8368876a92c959f2ac4 SHA512 da18dd185dfdf31f91b82de0d6d9ac4230db90cebb4decf880b3c931968653afc1879ddf30893ae9d74f3962539d33c8dcdcfec10fe0117e717a29346633706a WHIRLPOOL b4e71e71e6fc0f8be627a6a41e5eafdf0f44dcf4e7b7fa68865437e4b1d1802ad90d727e4771ee8feb2d4e1ad9561a103b9f2f113e32bebd5cac216963bc134f
+AUX spamprobe-1.4d-gcc47.patch 636 SHA256 bbb7414c399a63e48d0eea318009fd1423ddcc18e0243d836e6f728bbb882c7c SHA512 4148ff29d0d610dd5a7a4550c4424f49723f53f0954873a799180aff12dbe517846930f5e976edf39f6eb48122b7ccb1cb90a741ecb7dfe76b9af9c1b7194e52 WHIRLPOOL 5e77582148bedae17e311fe4e6a11e0da2536d9aad2ab57885cbe57faf05abf567cefde4f47dca5840e355b3dcea3eaf7d1624d3b746f1eb67a4b55b30d102aa
+AUX spamprobe-1.4d-libpng14.patch 786 SHA256 e999b5a6b55fbea6fd5a266450c2e664c72bbafd7bc92a2a5954d3fee55e1217 SHA512 cac68c7b5eefb679fd43b9e65c23dc956fd6bcbd81c1e025f346e7f0cce3e903b6dbb98aa19b5acbd7a43b8851c40a1365d45b5da0803a63164df2fd46196323 WHIRLPOOL e73a7300103bffd13063bd5702caa9dfe0dea9d39eb76d908e7c063971467fa2a2d13225bd2c3b4c43b9dfa87afe4c0d31c4dd0168c52baf54d70f84d7261c7d
+DIST spamprobe-1.4d.tar.gz 262761 SHA256 217ce47dcc6f58d8201fbb0a5e2dc38b5b06349fadb1378fb3647ad8a3f44d68 SHA512 176097b7e9de04a26a0a6a2c6b331ff375108ef7eb20cdfbda9abeec7ceb24a52c0edc932d8fcd8a5731f06b891469b4ee328562f4e88fbe6c737b719f45a8d8 WHIRLPOOL 854a8a4b711bcd4d8dccc1f7cfc5ee935eeba1af1b46e9c427da57c4f5a9742b1c49ee0bd6f9a471e42ca5ec7385656f118f8373e220ad45c3dd8031e2f5bd03
+EBUILD spamprobe-1.4d.ebuild 1030 SHA256 bf0bcc8a9bfb004b9ff130b46fb8c591c287ce1a61a211903466026f472b88ca SHA512 da7a1f25206f7727aaeb1e5c1d34238c2bd68865f7940fd48fd7785b532d1a2d090b9e720f29af96f3a5fb11473e12869145144b1242848e35abd220a9c8fdc4 WHIRLPOOL 5e61cd7b0b46bc678e76fdc943ff58f432ac001f8b608c4833e7ce98a72450c7790c4bdb612e08e4ea6b079c4b2e1952e99f1b66e3151b167ad356a92a1020fa
+MISC ChangeLog 4283 SHA256 c49d59935161aea887775a122a2a5d6aa834c014da0ce801180504b0554af654 SHA512 89b3ee4e337f2ee452e5664c121dcd8d61f3f60cbde1a15dbfac0aa5ef0c475fb01c7c5d1400c20c71ecbfe84d773fa6d07a7cee30eb05cf2da004652a540ddc WHIRLPOOL 1fc9be052a7fe09b148bb0d335bb2cdfe5e6c3248e20bbee9d3ed5b5efbc9152532d53a5b5dd75be25e46eb57fa3f54475dc09731d4b7f92f9438f9454d9d052
+MISC metadata.xml 162 SHA256 569031668e39895fb20829fb17a49a91a83e8f41b2195b0f04825c4340d2af6b SHA512 b706438a0eda682ad16d8e2217bd54d5fa9f8b305efc6e009d0bf523df159162afee0fae9107c5887e12bb64951bbee4c36c8f4744d008ba8fc2db4c01504fa2 WHIRLPOOL d1196dde03902f1b7eee5c0ad8e30243470e014ec8b6d56fe556125f636872345f0dec41e45f39fa14993db3db78a782efdcf26c3d50cdccd88f4f7c8b7dc67a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRI7hcAAoJEO04vUmVeoRjbH0H/j1ePFG0xpzo6Hi0sQmS2Hvi
+j2zNikmdS8W5CJyTKbdCgebfRPWReCYXxXa9fb+XcnQfOYdibu8KYlaSkqoJXx5N
+Fv/IRRNN+gyEbONYeUNuvAw5H39itEbIfWXbAyyVHmZR9ZtgcJL9JS84h3zbcJ2D
+ChD88YdX/VH5nI6X75vh2sI9kWvbsf6JJH+x9ytuoBYVJ3GtP5yo6DNo0BGl75pC
+7trhuwJeBeWIOHC9yHZqt34h2dol57lVZ9K4QkDUrIg9xOAhBiaUODAvVomgbQKK
+GnJE+IpIVd2fzJHS3hrdE7tHgoaEYSWGt4LhXYAUsg6U4aSpeyYCmitky48EjKU=
+=RGBq
+-----END PGP SIGNATURE-----
diff --git a/mail-filter/spamprobe/files/spamprobe-1.4d-gcc47.patch b/mail-filter/spamprobe/files/spamprobe-1.4d-gcc47.patch
new file mode 100644
index 000000000000..d281f57a3616
--- /dev/null
+++ b/mail-filter/spamprobe/files/spamprobe-1.4d-gcc47.patch
@@ -0,0 +1,28 @@
+ https://bugs.gentoo.org/421769
+
+ ../../src/includes/Ref.h:248:5: error: 'assign' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation
+ 
+
+ src/includes/Ref.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/includes/Ref.h
++++ b/src/includes/Ref.h
+@@ -189,7 +189,7 @@ public:
+ 
+   CRef<T> &operator=(const CRef<T> &other)
+   {
+-    assign(other);
++    this->assign(other);
+     return *this;
+   }
+ 
+@@ -245,7 +245,7 @@ public:
+ 
+   Ref<T> &operator=(const Ref<T> &other)
+   {
+-    assign(other);
++    this->assign(other);
+     return *this;
+   }
+ 
diff --git a/mail-filter/spamprobe/spamprobe-1.4d.ebuild b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
index 083e0d5fad30..97e5933f66fd 100644
--- a/mail-filter/spamprobe/spamprobe-1.4d.ebuild
+++ b/mail-filter/spamprobe/spamprobe-1.4d.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.7 2011/02/26 17:05:15 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/spamprobe/spamprobe-1.4d.ebuild,v 1.8 2013/02/19 17:26:44 dirtyepic Exp $
 
 EAPI=2
 inherit eutils
@@ -22,7 +22,8 @@ DEPEND="berkdb? ( >=sys-libs/db-3.2 )
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.4b-gcc43.patch \
 		"${FILESDIR}"/${P}-libpng14.patch \
-		"${FILESDIR}"/${P}+db-5.0.patch
+		"${FILESDIR}"/${P}+db-5.0.patch \
+		"${FILESDIR}"/${P}-gcc47.patch
 }
 
 src_configure() {