Fix building with glibc-2.10, bug #273522

Package-Manager: portage-2.2_rc33/cvs/Linux i686

4 files changed, 28 insertions, 11 deletions

diff --git a/games-mud/mcl/ChangeLog b/games-mud/mcl/ChangeLog
index ca3ca6743b95..be5629bd9c97 100644
--- a/games-mud/mcl/ChangeLog
+++ b/games-mud/mcl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/mcl
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/ChangeLog,v 1.18 2008/11/30 08:05:44 tupone Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/ChangeLog,v 1.19 2009/06/13 23:56:18 nyhm Exp $
+
+  13 Jun 2009; Tristan Heaven <nyhm@gentoo.org> mcl-0.53.00.ebuild,
+  +files/mcl-0.53.00-glibc2.10.patch:
+  Fix building with glibc-2.10, bug #273522
 
   30 Nov 2008; Tupone Alfredo <tupone@gentoo.org>
   -files/mcl-0.53.00-inputlines.patch, mcl-0.53.00.ebuild:
diff --git a/games-mud/mcl/Manifest b/games-mud/mcl/Manifest
index e210fe436791..167bcedeb1bc 100644
--- a/games-mud/mcl/Manifest
+++ b/games-mud/mcl/Manifest
@@ -6,16 +6,17 @@ AUX 0.53.00-vc.patch 1313 RMD160 bafc81e33ed922f1421409d1f41927e1dbba3ec9 SHA1 7
 AUX mcl-0.53.00-fPIC.patch 797 RMD160 4952bd1e129c74e8767891c4ec42fd75be98c9a9 SHA1 7251111ecba5a31d0604dcb600f632c8d923b79f SHA256 7ec1d684ec485c66e559c3c3743c19be0fb5301269b42bf1851f9ed8bf39de69
 AUX mcl-0.53.00-gcc34.patch 476 RMD160 64827d3bd25993962520cb2a4f3b37f9b9441da8 SHA1 1af7d63e7cdb3a66de885456425900006d20040a SHA256 0be999b66bc629eb6c6617b361c0484e216723387d54a4b3ea65d5e17f1c5171
 AUX mcl-0.53.00-gcc42.patch 442 RMD160 9494937fdb195b8974238cb5e70af9ae9c8a3abc SHA1 7c9f940e046cb4853101d7031117cb44b13db875 SHA256 f965c6258b83d3581ea69990f959ff4963d0625ec03974967ec1ab388838d041
+AUX mcl-0.53.00-glibc2.10.patch 378 RMD160 10cdffab7546e497989f3a67ec57d27a50c51f09 SHA1 3263d0f7337423adb186dba0413ade5a894680a7 SHA256 71c749863724253c2774bf2a0ada03a7bd66f9901b5e2ec0bfb8af3c46fb6d85
 AUX mcl-0.53.00-libdir.patch 1213 RMD160 d6021616f794df59467d6f9c6a36ffba13c00e5e SHA1 a7f1bb5e14e4b23537f857294aecec58ee4ab86e SHA256 2ae675268d606fe57956eeaa9087463e711ff562cd9f81ca05649c38e5ba0007
 DIST mcl-0.53.00-inputlines.patch.gz 5631 RMD160 36460c13f95e26b19788ed68bb6e7397153f5888 SHA1 5e885e063c2016f776615a77322f6cbf34e2b700 SHA256 31348d4b516fa2f4ca7c96dc3367ad7eb9ddb511805f1a2d748088aac38592ab
 DIST mcl-0.53.00-src.tar.gz 225100 RMD160 207f6494c579acbd814a2f70550833003a4729cd SHA1 1cd3df0301f4739a759ec968a931987be15277bb SHA256 39416133970e9b17e1e2aafc0eb6e1eb95f367c9882efba1439546b1702f43e2
-EBUILD mcl-0.53.00.ebuild 1462 RMD160 e888f11e0343ccd95040ee9f4adcfbda9a420643 SHA1 2076769b059b10b436ad961e8dc0be59cd49cff8 SHA256 cb03948c53759f7ad509ebb50af3d76f42b74027d15c7e938c7c8c70cfd259a1
-MISC ChangeLog 2615 RMD160 388f1f3ec69e208127b78a1835ce92efb6ebce60 SHA1 184cf80e946f86a218b3e394a10fc54b7d01d1a9 SHA256 95452e23cc2852682e6c830044eddfbeab7f7ad1f49020e2fa737f7e2b80e974
+EBUILD mcl-0.53.00.ebuild 1499 RMD160 a17aa3ed9c257a25439321440c0ba10eaab05b14 SHA1 137d796d5fd7564abc653e8cf0c968554ba4e83f SHA256 727cce41ad38b5cd4cf271ac6b83c3cfad1fe191682f3943be825c63259b8aef
+MISC ChangeLog 2764 RMD160 5ff684836a856d7275bdd7b03f8e45eb893466fd SHA1 249a842b20b2a209fe900f98b3ffdbc0c60d7372 SHA256 9d90202cc99af58a5cdc6872a378140ccd7822abf498b6b9d0da05f41c2145ed
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkkySV4ACgkQSYz9rjec82aLfACfY890djLrCdjoWRi5MyABfT9z
-9GQAnAmKu3Q0yjgCahSffsu0df1uOqpb
-=ej47
+iEYEARECAAYFAko0PKcACgkQdz7hIScOURETqACgvkjN3s4OhQaudMIcbTn6lN+Q
+cyYAn0jn8LvwDZShh2VHpFIL3zNd9hQ7
+=IJNW
 -----END PGP SIGNATURE-----
diff --git a/games-mud/mcl/files/mcl-0.53.00-glibc2.10.patch b/games-mud/mcl/files/mcl-0.53.00-glibc2.10.patch
new file mode 100644
index 000000000000..62bedb8b7c93
--- /dev/null
+++ b/games-mud/mcl/files/mcl-0.53.00-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- plugins/PythonEmbeddedInterpreter.cc
++++ plugins/PythonEmbeddedInterpreter.cc
+@@ -132,7 +132,7 @@
+ bool PythonEmbeddedInterpreter::run_quietly(const char *file, const char *args,
+                                           char *result, bool suppress)
+ {
+-  char *func = strrchr(file, '/');
++  char *func = strrchr((char *)file, '/');
+   char buf[256];
+ 
+   if(func) func++;
diff --git a/games-mud/mcl/mcl-0.53.00.ebuild b/games-mud/mcl/mcl-0.53.00.ebuild
index ddbcfac0ec39..94034fa07e72 100644
--- a/games-mud/mcl/mcl-0.53.00.ebuild
+++ b/games-mud/mcl/mcl-0.53.00.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/mcl-0.53.00.ebuild,v 1.18 2008/11/30 08:05:44 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/mcl/mcl-0.53.00.ebuild,v 1.19 2009/06/13 23:56:18 nyhm Exp $
 
 inherit eutils games
 
@@ -28,7 +28,8 @@ src_unpack() {
 		"${FILESDIR}"/${PV}-dynacomplete.patch \
 		"${FILESDIR}"/${P}-libdir.patch \
 		"${WORKDIR}"/${P}-inputlines.patch \
-		"${FILESDIR}"/${P}-gcc42.patch
+		"${FILESDIR}"/${P}-gcc42.patch \
+		"${FILESDIR}"/${P}-glibc2.10.patch
 
 	sed -i \
 		-e "/MCL_LIBRARY_PATH/ s:/usr/lib/mcl:$(games_get_libdir)/${PN}:" \