Fixing crash after gcc-4 update. Bug #149004

(Portage version: 2.1.1)

4 files changed, 107 insertions, 1 deletions

diff --git a/games-arcade/xevil/ChangeLog b/games-arcade/xevil/ChangeLog
index 10f1b9a71d1f..817e96f32ab3 100644
--- a/games-arcade/xevil/ChangeLog
+++ b/games-arcade/xevil/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-arcade/xevil
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.10 2006/06/23 05:00:28 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.11 2006/10/15 22:57:06 tupone Exp $
+
+*xevil-2.02_p2-r1 (15 Oct 2006)
+
+  15 Oct 2006; <tupone@gentoo.org> +files/xevil-2.02_p2-memErr.patch,
+  -xevil-2.02_p2.ebuild, +xevil-2.02_p2-r1.ebuild:
+  Fixing crash after gcc-4 update. Bug #149004 by Denilson
 
   23 Jun 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/xevil-2.02_p2-gcc41.patch, xevil-2.02_p2.ebuild:
diff --git a/games-arcade/xevil/files/digest-xevil-2.02_p2-r1 b/games-arcade/xevil/files/digest-xevil-2.02_p2-r1
new file mode 100644
index 000000000000..dad04f8b198b
--- /dev/null
+++ b/games-arcade/xevil/files/digest-xevil-2.02_p2-r1
@@ -0,0 +1,6 @@
+MD5 c78641e65ab8e1c3596b140d938c3f26 xevil_2.02r2-4.diff.gz 27758
+RMD160 95823d4b7b52154b7c1f3a2fa14f3dc7b49b7937 xevil_2.02r2-4.diff.gz 27758
+SHA256 cc9eb6d66beb66420a8c2fb028a2ca102df4bff100adc1baf3d687c5862859fc xevil_2.02r2-4.diff.gz 27758
+MD5 09a9ef720b7204b0be68c4f462def370 xevilsrc2.02r2.zip 1857315
+RMD160 dca82298ac2dfe66e4e92a02731bb6851563b67e xevilsrc2.02r2.zip 1857315
+SHA256 45a72def6f7532bd4b7193932df09c1ba4eada2433382c494b37d4733e743188 xevilsrc2.02r2.zip 1857315
diff --git a/games-arcade/xevil/files/xevil-2.02_p2-memErr.patch b/games-arcade/xevil/files/xevil-2.02_p2-memErr.patch
new file mode 100644
index 000000000000..e505b0dfd80b
--- /dev/null
+++ b/games-arcade/xevil/files/xevil-2.02_p2-memErr.patch
@@ -0,0 +1,47 @@
+--- cmn/game.cpp.old	2006-10-15 23:42:45.000000000 +0200
++++ cmn/game.cpp	2006-10-15 23:43:05.000000000 +0200
+@@ -794,7 +794,7 @@
+ 
+   // Just for tracing in the debugger.
+   char* version = Utils::get_OS_info();
+-  delete version;
++  delete [] version;
+ 
+   noUi = False;
+   noNewLevel = False;
+@@ -1057,7 +1057,7 @@
+ 
+ Game::~Game() {
+   if (oneItem) {
+-    delete oneItem;
++    delete [] oneItem;
+   }
+ 
+   delete ui;
+@@ -2252,7 +2252,6 @@
+               if (keysym != NoSymbol)
+                 right[n][which] = keysym;
+             }
+-            delete option;
+ 	      }
+ 	      
+ 	      { // Left Keys.
+@@ -2271,7 +2271,6 @@
+               if (keysym != NoSymbol)
+                 left[n][which] = keysym;
+             }
+-            delete option;
+ 	      }
+ 	    }
+ 
+--- x11/ui.cpp.old	2006-10-16 00:15:14.000000000 +0200
++++ x11/ui.cpp	2006-10-16 00:15:21.000000000 +0200
+@@ -867,7 +867,7 @@
+       char *msg;
+       if (msg = locator->message_deq()) {
+         set_message(msg);
+-        delete msg;
++        delete [] msg;
+         messageTimer.set(MESSAGE_TIME);
+       }
+     }
diff --git a/games-arcade/xevil/xevil-2.02_p2-r1.ebuild b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
new file mode 100644
index 000000000000..e3cbc0cb8b82
--- /dev/null
+++ b/games-arcade/xevil/xevil-2.02_p2-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 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.1 2006/10/15 22:57:06 tupone Exp $
+
+inherit eutils games
+
+DEB_PATCH=4
+MY_PV=${PV/_p/r}
+DESCRIPTION="3rd person, side-view, fast-action, kill-them-before-they-kill-you game"
+HOMEPAGE="http://www.xevil.com/"
+SRC_URI="http://www.xevil.com/download/stable/xevilsrc${MY_PV}.zip
+	mirror://debian/pool/main/x/xevil/xevil_${MY_PV}-${DEB_PATCH}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="ppc x86"
+IUSE=""
+
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	edos2unix readme.txt x11/*.{cpp,h} cmn/*.{cpp,h} makefile config.mk
+	epatch "${WORKDIR}"/xevil_${MY_PV}-${DEB_PATCH}.diff \
+		"${FILESDIR}"/${P}-memErr.patch
+	sed -i \
+		-e 's:-static::' \
+		-e "s:CFLAGS=\":CFLAGS=\"${CFLAGS} :g" \
+		-e 's:-lXpm:-lXpm -lpthread:g' \
+		config.mk || die "sed failed"
+}
+
+src_compile() {
+	emake STRIP=true || die "emake failed"
+}
+
+src_install() {
+	dogamesbin x11/REDHAT_LINUX/xevil || die "dogamesbin failed"
+	newgamesbin x11/REDHAT_LINUX/serverping xevil-serverping \
+		|| die "newgamesbin failed"
+	dodoc readme.txt
+	prepgamesdirs
+}