non-maintainer commit: fix building with gcc-4.6 wrt #363017 by Diego Elio Petteno

Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64

4 files changed, 38 insertions, 10 deletions

diff --git a/net-im/centerim/ChangeLog b/net-im/centerim/ChangeLog
index 3eee8a76a6f9..75ae50c847ac 100644
--- a/net-im/centerim/ChangeLog
+++ b/net-im/centerim/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/centerim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.47 2011/03/12 13:29:58 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/ChangeLog,v 1.48 2011/11/04 18:34:59 xarthisius Exp $
+
+  04 Nov 2011; Kacper Kowalik <xarthisius@gentoo.org> centerim-4.22.10.ebuild,
+  +files/centerim-4.22.10-gcc46.patch:
+  non-maintainer commit: fix building with gcc-4.6 wrt #363017 by Diego Elio
+  Petteno
 
   12 Mar 2011; Sven Wegener <swegener@gentoo.org>
   -centerim-4.22.7-r1.ebuild,
diff --git a/net-im/centerim/Manifest b/net-im/centerim/Manifest
index e5bb59cc5d4e..5b6bde71aa7b 100644
--- a/net-im/centerim/Manifest
+++ b/net-im/centerim/Manifest
@@ -1,18 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX centerim-4.22.10-gcc46.patch 241 RMD160 bfe9a8f17aebaddb06c48c8e7b9444334fa92bbd SHA1 19289c57f4709af25a94f0b3a058a48aa7fc05d6 SHA256 9b26af1b97513c998cfe3b08c93aecf9a75357e6c2973dbe0ea99c38d5191896
 DIST centerim-4.22.10.tar.gz 2287832 RMD160 2514c871388edb98b4a8957f965ccee3450b968f SHA1 46fbac7a55f33b0d4f42568cca21ed83770650e5 SHA256 93ce15eb9c834a4939b5aa0846d5c6023ec2953214daf8dc26c85ceaa4413f6e
 DIST centerim-4.22.9.tar.gz 2252262 RMD160 253007e466a211ec740f7843538e4f686ab95cad SHA1 ebe9f4ee2064a2fa10f1084ce26083ccd295673e SHA256 47b79449e4d5a60ed2c829736b92b0c9189687aa8d9d0c4596957069f6a892ef
-EBUILD centerim-4.22.10.ebuild 2685 RMD160 68932efc505735cdcf23bb51817992566e3e56f4 SHA1 33be7921751a72a694300508b3e722f7dc326fab SHA256 8c93371df7ac7babe723320eb45e8896f1985aacd825cdea67e0e4850df3cea1
+EBUILD centerim-4.22.10.ebuild 2734 RMD160 d2ed219d7eb5f4ce034e86e755bb9c453681741b SHA1 f5e70194bb6c234a09dc6e40985d9ec6258694a5 SHA256 919bd510e1c6d8d87a74603f916ca4634250f66aa407db5707e9cde8aefc7dc6
 EBUILD centerim-4.22.9.ebuild 2564 RMD160 4a870f0ccd1e00482429a2670d77ba6a1f77c6f9 SHA1 3fb8e50cd540f462f2177820b0a4a3a56ffd5c7b SHA256 d8a5b99e09abfb9eb843976489fe8df14ef979de8dba5daf027827d93d2642de
-MISC ChangeLog 7866 RMD160 2fd44a3a0b69e7f6ac9c3bc1da63e12b81575e7d SHA1 9386456a3444b26180ab24ebab05936339491cd8 SHA256 a29dbbf9b18c2c1d52dafc7b4c81eb313d123c8176c186c17c41a049c38f508e
+MISC ChangeLog 8074 RMD160 39b5e99b9db41519bd3a706e1a1cde0b58b7801a SHA1 5ad781b1bf9101414c6144aa9012d27b9e57012d SHA256 bbc998755feac2233c9be609c7a9110fcd1cd917da61003df6c82fd37731a916
 MISC metadata.xml 520 RMD160 4a3630a1475cdce3ec005302baef7dee3670c390 SHA1 009fbaba4fd6b7e7402e9857e1d5b837684901e7 SHA256 4bc939faeb60271e87b123f5157fc1aed74f3f75821ca7f1ee209a4e4aef50f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59qNcACgkQfXuS5UK5QB3TsgP/VOpCapK1Oe77uU3xV+5PjZZV
-l9EmmfFkiDw1AP9OpA9C6RERh07p8pndlDoiyp3GNM82K1h/sTG52+bzsc10wum0
-1u2A6aL3VVrWnjkXF/oWMpI56UWx/CYKriG6s45RXqJP45yNjr4u4gYdm4A7j3TV
-oBcJyAuD+lv4q9p9qO0=
-=tihS
+iQIcBAEBCAAGBQJOtDBdAAoJEF0huFKJUZL5cTYP/2GYK2p4h/nslQQ7tcPB8MPP
+DbWQA23eztxTGvHQr/Akf3r588wr48A5Orf5xQWDexkBYoWhXAfVZ91JTu7Er/wA
+xLG3vKCtF2OF7mxdvnTAylMOv60OW5TkNIExlRVlgC/wWD9FOwkzoRbzuinnNC1l
+PZNDBOe4PVxPqqTSG7LpSUhD4WL3caZoDrebBK9agCP5fVlDvp4vxSS9g3IUKj6v
+cmUQiEPpQdvHNRe8I/GwHduLpYhimdra4vqq0uIKlrzduEjvukfDnpbpOyEFCVcd
+PLRZNyhXa0F6ry1JYMQ2UqDdcKA8H2Eqi3AJhpLJBE5iAmrnHMEWkDZXAB2fpNDa
+xJlNSV8mEodIrBdQMGjaHQ11175cy3VO5BDgTHF22U1rM7yHxgosjM5hUOwv1y8A
+j1HFCKdA7nKHrdhZqQpUGZGmdtkVcVnnaaswMsb6Z2hw0PWxLIHyxu30KVLGjHhm
+452NKuSoK5KSYABqmCzByhh1PlRUDcteLhZilzVypWTMKtxD5ohB+uVLWdI3o5eu
+lp/dqnT5oWuvlP5c124AmsmqT4RH4GCVby80TRci1GJuZLgUESerCBH0hH+2bFEt
+BCpep+/22JNkOeg1Az+H3nbH/urqdE0MhtlpT1rC4LuowGSQR17b8eJqKPnBIpKj
+gBT3OsKlrQPHpNJr/cTK
+=1LjQ
 -----END PGP SIGNATURE-----
diff --git a/net-im/centerim/centerim-4.22.10.ebuild b/net-im/centerim/centerim-4.22.10.ebuild
index 8d08e5a12088..7152eb14043c 100644
--- a/net-im/centerim/centerim-4.22.10.ebuild
+++ b/net-im/centerim/centerim-4.22.10.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.10.ebuild,v 1.2 2011/02/26 19:41:09 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/centerim/centerim-4.22.10.ebuild,v 1.3 2011/11/04 18:34:59 xarthisius Exp $
 
 EAPI="2"
 
+inherit eutils
+
 PROTOCOL_IUSE="+aim gadu +icq +irc +jabber lj +msn rss +yahoo"
 IUSE="${PROTOCOL_IUSE} bidi nls ssl crypt jpeg otr"
 
@@ -87,7 +89,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	epatch "${FILESDIR}"/${P}-gcc46.patch
 
 	# Don't execute git commands, bug #228151
 	cat >"${S}"/misc/git-version-gen <<-EOF
diff --git a/net-im/centerim/files/centerim-4.22.10-gcc46.patch b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
new file mode 100644
index 000000000000..a03e9eabd13f
--- /dev/null
+++ b/net-im/centerim/files/centerim-4.22.10-gcc46.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/show_bug.cgi?id=363017
+
+--- a/libicq2000/libicq2000/sigslot.h
++++ b/libicq2000/libicq2000/sigslot.h
+@@ -82,6 +82,7 @@
+ #ifndef SIGSLOT_H__
+ #define SIGSLOT_H__
+ 
++#include <cstddef>
+ #include <set>
+ #include <list>
+