Fix 0.6.2b version on gcc-4.6

Package-Manager: portage-2.1.10.5/cvs/Linux i686

4 files changed, 25 insertions, 9 deletions

diff --git a/dev-games/cegui/ChangeLog b/dev-games/cegui/ChangeLog
index daaf2f1d3d0f..0b375d716208 100644
--- a/dev-games/cegui/ChangeLog
+++ b/dev-games/cegui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/cegui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.35 2011/04/27 13:34:13 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/ChangeLog,v 1.36 2011/07/13 13:34:58 tupone Exp $
+
+  13 Jul 2011; Tupone Alfredo <tupone@gentoo.org> cegui-0.6.2b.ebuild,
+  +files/cegui-0.6.2b-gcc46.patch:
+  Fix 0.6.2b version on gcc-4.6 Bug #374501 by fkhp
 
   27 Apr 2011; Tupone Alfredo <tupone@gentoo.org> cegui-0.7.5-r1.ebuild,
   +files/cegui-0.7.5-gcc46.patch:
diff --git a/dev-games/cegui/Manifest b/dev-games/cegui/Manifest
index bfd8b4a5089e..da5730b73124 100644
--- a/dev-games/cegui/Manifest
+++ b/dev-games/cegui/Manifest
@@ -3,21 +3,22 @@ Hash: SHA1
 
 AUX cegui-0.6.2b-dups.patch 660 RMD160 908321a10f0917f9ef30fa8a67145bbcc2e28620 SHA1 5bbdbfaec76121daa450817cfedf7f5c38e00b7a SHA256 d3d9a5af79f49df8c5bff41c3d61034640c9e774e4a01bb28a0891684c95eaf0
 AUX cegui-0.6.2b-gcc43.patch 241 RMD160 d0b104b161a655da3ffb9aff0e53cc355beccd8e SHA1 521978347c5ad85c64a6c0727ddcef441fc349d9 SHA256 b2a2e715d4a0a6cdb2f0975c9474ce82edd97a34cdb3fe4d5c3ddbde0440db66
+AUX cegui-0.6.2b-gcc46.patch 296 RMD160 9f66d4c32fc999b078d14a71612130b414b3facf SHA1 9a6c508ebcd43382927e27d7d7324402baaa9abf SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11
 AUX cegui-0.7.5-gcc46.patch 296 RMD160 9f66d4c32fc999b078d14a71612130b414b3facf SHA1 9a6c508ebcd43382927e27d7d7324402baaa9abf SHA256 a497069fc8bc50b23b62f321025364d4d2988a575ec7aeb429b25b94b5d6bf11
 AUX cegui-0.7.5-tinyxml.patch 984 RMD160 d2f7ff2dfd2519116b32dccc92d130ce3a92e393 SHA1 fffe9d3d43731f74e31c731fa6a636c710af9b96 SHA256 0875cdcc967922c85cceeaf2447bca340de7c1b7297785ce9fadfa0ded75c342
 DIST CEGUI-0.6.2-DOCS.tar.gz 18396638 RMD160 f3b010ce170973c126be27495636de4e808d3e65 SHA1 33e1ebfa0ab4e7fe2a91c0bb0affb6dccb49a94c SHA256 f1ea46bd583c486a6c588118573ebde55b06e90b190083e95525820e950ce2c8
 DIST CEGUI-0.6.2b.tar.gz 2628081 RMD160 890a8af12eb1ed4b7de0765c1f1a521ad5b1d213 SHA1 ac373b0779ab4b6289cf1e6aa2e6717d8a348747 SHA256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f
 DIST CEGUI-0.7.5.tar.gz 9058788 RMD160 9602bcfbfe8b81c4fce415e0be341ea974040acc SHA1 75fe8d11c7c91ed3b08e8a2e81ff946699e51cf7 SHA256 21049e31a03fcd4807729c7271756e6d2de834247ece603bb5b5087fae624cb2
 DIST CEGUI-DOCS-0.7.5.tar.gz 11001948 RMD160 17455c07b56594bcd150a1e4f9c31ff5bdcda81d SHA1 4aa8e14ba5f5f577ecda4be17bb8b493ae5c37ba SHA256 2ee19e5bfa4c3a9c3ebc1f399df7276f5688cc2decfc8e175c9db12e464c5c4f
-EBUILD cegui-0.6.2b.ebuild 2476 RMD160 b096cd618706d3800929b6efe83bfeb6a28a127e SHA1 00f6dbbf11152689de3f97bfb894c063b9292936 SHA256 fa9ae0755016c660c68b39fd27a789ff3e2580826328aace9c74d667a5084172
+EBUILD cegui-0.6.2b.ebuild 2504 RMD160 2e87daad44a30f3fb89762b7de3ed98b33d9ace1 SHA1 ef91e048d023f67181d6528a52ba8590ed30a5f2 SHA256 afab7d31fe7b911e4870c9104cd1ad6c51a4c75ae5f6dafc7c133e83a8877227
 EBUILD cegui-0.7.5-r1.ebuild 2593 RMD160 303ff180478765abd8352baccf8e1268711167b1 SHA1 8042bd49ca3eb8bc927415ceb970d235f04550d0 SHA256 287d1cf212fed546ec2f7da1a3e6d20d588badee46c9a74f106a85089a6dbfd0
 EBUILD cegui-0.7.5.ebuild 2531 RMD160 8f9db86fe99c7352c2129f3488e9460bc0beaafd SHA1 97e25a0864836548730d65f4d3ac82457d88f574 SHA256 0c550f9e5d778f94ea65d5df5f9407ea34720646809e932c1c9843708ee15520
-MISC ChangeLog 4846 RMD160 70feec862844a93038bbd260752e2cc5847b930a SHA1 6f921a1eab2131b3cc43b041f7d6cd038f95f472 SHA256 87e10ea4a2b0df1a3a3c0efeee92cb64280dd660feafa36a8bc4c6dc6dbd543c
+MISC ChangeLog 5005 RMD160 88149ac765d61e93f4f8bd6f3aa31deb281afb92 SHA1 850fb970806d57dca33d85f15eff3198222a3dd4 SHA256 b87d59441b2199cb42841cfda2768ae1cd27b22c5b89e2197908db177b863c20
 MISC metadata.xml 558 RMD160 528f673643b01b6b0999eb432da7b92ba67daa78 SHA1 5cbd46ca0d6ed654b23c86b9569304bcc6378bfc SHA256 9b89adc7d9ebb8284daf3aaeb00facae942818a075698be43a1b9911e1ad56d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk24G18ACgkQIY77eQFFFC0UygCg4uSBdxg6pB3wE7tn2P56ztDC
-Sp0AnihTXWUqxy4lBy1KS37quPeQL/P6
-=/4+1
+iEYEARECAAYFAk4dnxoACgkQIY77eQFFFC3K/QCfTnkzMKM78ONCuh2UqDFJKJKl
+RtIAoL1TIJ36bygn1Z7+iMB8hMw3M21Q
+=yhUp
 -----END PGP SIGNATURE-----
diff --git a/dev-games/cegui/cegui-0.6.2b.ebuild b/dev-games/cegui/cegui-0.6.2b.ebuild
index fd6b4807800d..7e7bd7ee8e2b 100644
--- a/dev-games/cegui/cegui-0.6.2b.ebuild
+++ b/dev-games/cegui/cegui-0.6.2b.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/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.10 2010/11/06 01:45:36 rafaelmartins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.6.2b.ebuild,v 1.11 2011/07/13 13:34:58 tupone Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -41,7 +41,8 @@ S=${WORKDIR}/${MY_P}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-dups.patch
+		"${FILESDIR}"/${P}-dups.patch \
+		"${FILESDIR}"/${P}-gcc46.patch
 	sed -i \
 		-e 's/ILvoid/void/g' \
 		ImageCodecModules/DevILImageCodec/CEGUIDevILImageCodec.cpp \
diff --git a/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
new file mode 100644
index 000000000000..88f8fccfc206
--- /dev/null
+++ b/dev-games/cegui/files/cegui-0.6.2b-gcc46.patch
@@ -0,0 +1,10 @@
+--- cegui/include/CEGUIString.h.old	2011-04-27 14:33:25.862856070 +0200
++++ cegui/include/CEGUIString.h	2011-04-27 14:33:49.780351908 +0200
+@@ -34,6 +34,7 @@
+ #include <string>
+ #include <string.h>
+ #include <stdexcept>
++#include <cstddef>
+ 
+ // Start of CEGUI namespace section
+ namespace CEGUI