Fix building with GLIBC 2.10+ wrt #273557 by Arttu Valo.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 32 insertions, 16 deletions

diff --git a/games-arcade/xevil/ChangeLog b/games-arcade/xevil/ChangeLog
index e736ed24908b..38ac4232f720 100644
--- a/games-arcade/xevil/ChangeLog
+++ b/games-arcade/xevil/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-arcade/xevil
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.12 2008/01/06 01:27:58 mr_bones_ Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.13 2009/09/04 09:32:43 ssuominen Exp $
+
+  04 Sep 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xevil-2.02_p2-r1.ebuild, +files/xevil-2.02_p2-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #273557 by Arttu Valo.
 
   06 Jan 2008; Michael Sterrett <mr_bones_@gentoo.org>
   xevil-2.02_p2-r1.ebuild:
diff --git a/games-arcade/xevil/Manifest b/games-arcade/xevil/Manifest
index 704efd104467..ea6d641913b3 100644
--- a/games-arcade/xevil/Manifest
+++ b/games-arcade/xevil/Manifest
@@ -1,15 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX xevil-2.02_p2-glibc-2.10.patch 645 RMD160 26c41cc7646ddec08d952a08adfa3e2e500d198d SHA1 70299ce3375192a34c0544d85a8567c7485fd558 SHA256 202f129bce90f64d81bea7fc1b827c70ac30a793f06eb11f60e6d525f2f28b8c
 DIST xevil_2.02r2-7.diff.gz 31205 RMD160 f60a94656a6420f38434e22f85629a1b7f1ebc2d SHA1 21b0bc6f9792df62b4a5f7f2274fccdc0a25305f SHA256 7bd04cf75387779512105879682a2cdc3435a583a95d27a635a6968a9dbdc5c9
 DIST xevilsrc2.02r2.zip 1857315 RMD160 dca82298ac2dfe66e4e92a02731bb6851563b67e SHA1 e9a262daffc7ee5c06196dc94cf35c199be86bbc SHA256 45a72def6f7532bd4b7193932df09c1ba4eada2433382c494b37d4733e743188
-EBUILD xevil-2.02_p2-r1.ebuild 1225 RMD160 7038ecf3ecfe239392642c102d7c4a40160b1510 SHA1 9c53c69fbbc502a4536d495c0c4566db252ce16c SHA256 2f5403c42dc6e6f00715d0f9b4d1d091d101d91e8a8aba651e21571b66fbf28b
-MISC ChangeLog 1530 RMD160 f8621a87f66a4561c45129cc9d0b9cebc22b973e SHA1 ff2c5e7c422ccb93a848425c193f20c009051d56 SHA256 003f7687e270a9afc4f8b81fbf9669837c3bcfa2f952b8ef8be10f360deaacf6
+EBUILD xevil-2.02_p2-r1.ebuild 1269 RMD160 45a8118de221555792db849125a5e2468a871ab2 SHA1 c3cb3928d4cc92ca5ada1c0f5e8dc0627ee8746e SHA256 8c6e27f3fb0cea43e3e59192e2e36fac0204cc43545f4742888651ea2e29491a
+MISC ChangeLog 1710 RMD160 a7bded4c19d9c4f47b6b4c690e8f5ff9e1f13e54 SHA1 cb10bc4cda34a8cbf54eb272de776bb1a46a9082 SHA256 237fe0d9d841a70a39f983f7449f9f50527cff43e6696d4b47e29e2df31edb44
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoz+RsACgkQdz7hIScOURGxVgCgyx3tRIq+B6b8mSLM0yysJ+Zt
-7vcAoNLAAHNUWNpYY8m6CGb1ORS0HRS+
-=JWpy
------END PGP SIGNATURE-----
diff --git a/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch b/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch
new file mode 100644
index 000000000000..5375f2208a0d
--- /dev/null
+++ b/games-arcade/xevil/files/xevil-2.02_p2-glibc-2.10.patch
@@ -0,0 +1,20 @@
+diff -ur cmn.old/utils.h cmn/utils.h
+--- cmn.old/utils.h	2009-08-22 02:16:21.000000000 +0300
++++ cmn/utils.h	2009-08-22 02:26:33.000000000 +0300
+@@ -238,13 +238,13 @@
+      same. */
+ 
+   static char* strchr(const char* cs,int c)
+-    {return ::strchr(cs,c);}
++    {return const_cast<char*>(::strchr(cs,c));}
+ 
+   static char* strrchr(const char* cs,int c)
+-    {return ::strrchr(cs,c);}
++    {return const_cast<char*>(::strrchr(cs,c));}
+ 
+   static char* strstr(const char* cs,const char* ct)
+-    {return ::strstr(cs,ct);}
++    {return const_cast<char*>(::strstr(cs,ct));}
+ 
+   static void strcpy(char* s,const char* ct)
+     {::strcpy(s,ct);}
diff --git a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
index e2b4d4da6aa3..93173ec00831 100644
--- a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
+++ b/games-arcade/xevil/xevil-2.02_p2-r1.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-arcade/xevil/xevil-2.02_p2-r1.ebuild,v 1.3 2008/01/06 01:27:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/xevil-2.02_p2-r1.ebuild,v 1.4 2009/09/04 09:32:43 ssuominen Exp $
 
 inherit eutils games
 
@@ -31,6 +31,7 @@ src_unpack() {
 		-e "s:CFLAGS=\":CFLAGS=\"${CFLAGS} :g" \
 		-e 's:-lXpm:-lXpm -lpthread:g' \
 		config.mk || die "sed failed"
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
 }
 
 src_compile() {