Fix building with glibc-2.10, bug #273498

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

4 files changed, 31 insertions, 16 deletions

diff --git a/games-mud/crystal/ChangeLog b/games-mud/crystal/ChangeLog
index e82fa874ad46..d5e13adabaeb 100644
--- a/games-mud/crystal/ChangeLog
+++ b/games-mud/crystal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-mud/crystal
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.6 2008/05/01 10:30:07 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.7 2009/06/14 00:17:47 nyhm Exp $
+
+  14 Jun 2009; Tristan Heaven <nyhm@gentoo.org> crystal-0.2.2.ebuild,
+  +files/crystal-0.2.2-glibc2.10.patch:
+  Fix building with glibc-2.10, bug #273498
 
   01 May 2008; Tristan Heaven <nyhm@gentoo.org>
   +files/crystal-0.2.2-64bit.patch, +files/crystal-0.2.2-gcc43.patch,
diff --git a/games-mud/crystal/Manifest b/games-mud/crystal/Manifest
index 56aef2b6ee40..e989507425c8 100644
--- a/games-mud/crystal/Manifest
+++ b/games-mud/crystal/Manifest
@@ -3,14 +3,15 @@ Hash: SHA1
 
 AUX crystal-0.2.2-64bit.patch 283 RMD160 cfafc4157a816c3fa291bfe76810c579c2ca890e SHA1 3925c6e9ca50e13aeff88e3905cf6fe050c9b48a SHA256 6d33b8f92cf7af45a48e5f46c6db4effdfc600160fea1e3ac04f4cbdf12f8fe2
 AUX crystal-0.2.2-gcc43.patch 190 RMD160 271e84ccfff610ca7035bde52d6e492f7fb89840 SHA1 f9b4d0c767a9586988f80620f356f47a3c8d8ddc SHA256 fc1a5a9911f54da5120d65aabf542d083de65a1c044ce06cf98f69895fe96606
+AUX crystal-0.2.2-glibc2.10.patch 266 RMD160 8c62d6e79f7285ccceb487cdba90c99227bda7e2 SHA1 0c41f9dfe087f83e6faae6c76fb33fdbff248592 SHA256 31392d94c1325b27b2d3b257510d38bd49c3733675969c16cb1725eb65891965
 DIST crystal-0.2.2.tar.gz 96400 RMD160 28339b6d01fc99c3bc5423611421b90bda0dc77a SHA1 5c031ac5c89c6ae43773f9d6b4969f8979bda63c SHA256 379576a9197a3be38f0efd390ee09b72b6772d4598910d0988d5dc8771ed7670
-EBUILD crystal-0.2.2.ebuild 833 RMD160 8c6128802e21fc4596dfe5a3d288b5deabf040d9 SHA1 c0f1323c335970a0fce93faedf3336234405a25d SHA256 244a9983c7033db0688c2553adda94a9ddcf2400bd1dc6ededd5add47544d05e
-MISC ChangeLog 885 RMD160 75380dfa0797a5c5e7477b6572211293da63b9c1 SHA1 6c662cec04914af0bd0433ffd4fc7300198ed0a0 SHA256 7413aa1d46b51ccd4fc98198d0ec843546027500287740b43ad0fe4021bec049
+EBUILD crystal-0.2.2.ebuild 829 RMD160 24f180e2d644e597e5d33cecc25433c2d038476c SHA1 63008f5f5287148699cd7c2280cff077269a2973 SHA256 e164b780408d4a5835bbb162ba0434b6e6161691bf22ebc85422786194532844
+MISC ChangeLog 1040 RMD160 d17a0cb28686e8051b5d4de8984969bd510d37a7 SHA1 a49516752d11de2d67b3bfffd8553e125ef1df5c SHA256 437329c2f043f359c154f1ff98d5d4fa0a7a240f0479b4fa1afdab4dd483a5bc
 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)
 
-iEYEARECAAYFAkgZm7UACgkQdz7hIScOURGsYgCgnmZtNmZ8Yf7UyaZFwRRJ262o
-yykAnRqPT83UzeepjEbx65dvSY88kUj8
-=qHss
+iEYEARECAAYFAko0QbAACgkQdz7hIScOUREbCgCfVR7r5u6rgMd+rZavCUUyLrDD
+gggAn1ThJYOMjwX2WYclzan5YEU7BzRm
+=HYn+
 -----END PGP SIGNATURE-----
diff --git a/games-mud/crystal/crystal-0.2.2.ebuild b/games-mud/crystal/crystal-0.2.2.ebuild
index 41a253dcd827..4dd6ca682e70 100644
--- a/games-mud/crystal/crystal-0.2.2.ebuild
+++ b/games-mud/crystal/crystal-0.2.2.ebuild
@@ -1,7 +1,8 @@
-# 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/crystal/crystal-0.2.2.ebuild,v 1.2 2008/05/01 10:30:07 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.2.ebuild,v 1.3 2009/06/14 00:17:47 nyhm Exp $
 
+EAPI=2
 inherit eutils games
 
 DESCRIPTION="The crystal MUD client"
@@ -17,18 +18,16 @@ DEPEND="sys-libs/zlib
 	sys-libs/ncurses
 	dev-libs/openssl"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-64bit.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-glibc2.10.patch
 }
 
-src_compile() {
+src_configure() {
 	egamesconf \
 		--disable-scripting || die
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/games-mud/crystal/files/crystal-0.2.2-glibc2.10.patch b/games-mud/crystal/files/crystal-0.2.2-glibc2.10.patch
new file mode 100644
index 000000000000..fc1eaf7679ac
--- /dev/null
+++ b/games-mud/crystal/files/crystal-0.2.2-glibc2.10.patch
@@ -0,0 +1,11 @@
+--- Socket.cc
++++ Socket.cc
+@@ -344,7 +344,7 @@
+ 
+   const char *srv = 0, *lasth = 0;
+ 
+-  if (char *u=strchr(s, '@')) {
++  if (const char *u=strchr(s, '@')) {
+     printf("We have a username part.\n");
+     username = std::string(s, u-s);
+     has_username = true;