Fix building with gcc-4.3

Package-Manager: portage-2.1.5_rc6

5 files changed, 56 insertions, 9 deletions

diff --git a/games-mud/crystal/ChangeLog b/games-mud/crystal/ChangeLog
index f194a1dcade8..e82fa874ad46 100644
--- a/games-mud/crystal/ChangeLog
+++ b/games-mud/crystal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-mud/crystal
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/ChangeLog,v 1.5 2005/07/10 04:51:41 mr_bones_ Exp $
+# 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 $
+
+  01 May 2008; Tristan Heaven <nyhm@gentoo.org>
+  +files/crystal-0.2.2-64bit.patch, +files/crystal-0.2.2-gcc43.patch,
+  crystal-0.2.2.ebuild:
+  Fix building with gcc-4.3
 
 *crystal-0.2.2 (10 Jul 2005)
 
diff --git a/games-mud/crystal/Manifest b/games-mud/crystal/Manifest
index 0fea050b2e01..56aef2b6ee40 100644
--- a/games-mud/crystal/Manifest
+++ b/games-mud/crystal/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 DIST crystal-0.2.2.tar.gz 96400 RMD160 28339b6d01fc99c3bc5423611421b90bda0dc77a SHA1 5c031ac5c89c6ae43773f9d6b4969f8979bda63c SHA256 379576a9197a3be38f0efd390ee09b72b6772d4598910d0988d5dc8771ed7670
-EBUILD crystal-0.2.2.ebuild 702 RMD160 c4e1a3c81cfa56bffc3a5a4f9f805fc5fe970a43 SHA1 43b1e5bd59c1ea841d91718413b3e2c588179849 SHA256 2c150def4c04a17551078c05d860ac01409d9c40bc79f3538fa9ac7dde0780a1
-MISC ChangeLog 719 RMD160 7d66bd06d2b41add8afdc290f51136833a7e6e7b SHA1 473e280ae3e62da2baf09faa1cce17b2d0d7c41d SHA256 2059f8b2658d1a5c6871aaee8f142ecff34e62f2c2f700759b7ce3e03b591bc9
+EBUILD crystal-0.2.2.ebuild 833 RMD160 8c6128802e21fc4596dfe5a3d288b5deabf040d9 SHA1 c0f1323c335970a0fce93faedf3336234405a25d SHA256 244a9983c7033db0688c2553adda94a9ddcf2400bd1dc6ededd5add47544d05e
+MISC ChangeLog 885 RMD160 75380dfa0797a5c5e7477b6572211293da63b9c1 SHA1 6c662cec04914af0bd0433ffd4fc7300198ed0a0 SHA256 7413aa1d46b51ccd4fc98198d0ec843546027500287740b43ad0fe4021bec049
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgZm7UACgkQdz7hIScOURGsYgCgnmZtNmZ8Yf7UyaZFwRRJ262o
+yykAnRqPT83UzeepjEbx65dvSY88kUj8
+=qHss
+-----END PGP SIGNATURE-----
diff --git a/games-mud/crystal/crystal-0.2.2.ebuild b/games-mud/crystal/crystal-0.2.2.ebuild
index 3efad49fb084..41a253dcd827 100644
--- a/games-mud/crystal/crystal-0.2.2.ebuild
+++ b/games-mud/crystal/crystal-0.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 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.1 2005/07/10 04:51:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/crystal/crystal-0.2.2.ebuild,v 1.2 2008/05/01 10:30:07 nyhm Exp $
 
-inherit games
+inherit eutils games
 
 DESCRIPTION="The crystal MUD client"
 HOMEPAGE="http://www.evilmagic.org/crystal/"
@@ -10,13 +10,21 @@ SRC_URI="http://www.evilmagic.org/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~ppc x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="sys-libs/zlib
 	sys-libs/ncurses
 	dev-libs/openssl"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch \
+		"${FILESDIR}"/${P}-64bit.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
+}
+
 src_compile() {
 	egamesconf \
 		--disable-scripting || die
@@ -24,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS NEWS README TODO
 	prepgamesdirs
 }
diff --git a/games-mud/crystal/files/crystal-0.2.2-64bit.patch b/games-mud/crystal/files/crystal-0.2.2-64bit.patch
new file mode 100644
index 000000000000..0d82356b7c24
--- /dev/null
+++ b/games-mud/crystal/files/crystal-0.2.2-64bit.patch
@@ -0,0 +1,11 @@
+--- Socket.cc
++++ Socket.cc
+@@ -212,7 +212,7 @@
+ int Socket::read(char *data, int size) {
+   if (pending) {
+     int opt = 0;
+-    size_t osz = sizeof(int);
++    socklen_t osz = sizeof(int);
+     getsockopt(fd, SOL_SOCKET, SO_ERROR, &opt, &osz);
+     pending = 0;
+     if (opt != 0)
diff --git a/games-mud/crystal/files/crystal-0.2.2-gcc43.patch b/games-mud/crystal/files/crystal-0.2.2-gcc43.patch
new file mode 100644
index 000000000000..40623c5c22b3
--- /dev/null
+++ b/games-mud/crystal/files/crystal-0.2.2-gcc43.patch
@@ -0,0 +1,11 @@
+--- common.h
++++ common.h
+@@ -3,6 +3,8 @@
+ 
+ #include <string>
+ #include <stdio.h>
++#include <cstring>
++#include <cstdlib>
+ #include <curses.h>
+ #include <termios.h>
+ #include <sys/ioctl.h>