Fixing gcc-4.1 compilation

Package-Manager: portage-2.1_pre9-r4

5 files changed, 83 insertions, 13 deletions

diff --git a/games-arcade/xevil/ChangeLog b/games-arcade/xevil/ChangeLog
index cdd340cb5c21..37ef2bb4bcd6 100644
--- a/games-arcade/xevil/ChangeLog
+++ b/games-arcade/xevil/ChangeLog
@@ -1,6 +1,10 @@
 # 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.8 2006/01/29 00:00:28 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/ChangeLog,v 1.9 2006/04/27 21:50:15 tupone Exp $
+
+  27 Apr 2006; <Tupone@gentoo.org> +files/xevil-2.02_p2-gcc41.patch,
+  xevil-2.02_p2.ebuild:
+  Fixing compilation on gcc-4.1
 
   28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
   xevil-2.02_p2.ebuild:
diff --git a/games-arcade/xevil/Manifest b/games-arcade/xevil/Manifest
index e2ee3bf9454c..de3f516df838 100644
--- a/games-arcade/xevil/Manifest
+++ b/games-arcade/xevil/Manifest
@@ -1,12 +1,31 @@
-MD5 e85cc79cd663077b0162e3797f929c1d ChangeLog 833
-RMD160 e78643c2945697d0bedc90fecfb72c027c213d8f ChangeLog 833
-SHA256 f3ed61370c670025fb1b06adc2d5e3a47405d59f18a3784173c275022d624a0a ChangeLog 833
-MD5 f82eccd2bfaf4e7990a45c7075a64659 files/digest-xevil-2.02_p2 130
-RMD160 a6b6a1e493f3b3bb1db1059a1367d171c048e57c files/digest-xevil-2.02_p2 130
-SHA256 f0444b38459e703de8c3cabc3f944170097ab20047800d55b92cbc79247f9d46 files/digest-xevil-2.02_p2 130
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX xevil-2.02_p2-gcc41.patch 1200 RMD160 748117fffab1a0192e24fb8080460af56a7b8b59 SHA1 7247aa215996b72d96db6b3ba7242749f9fcc23b SHA256 ae507aebe8d41bbf2efc79de510b8e4083217c6d8c3db382f4a7522f10d3e715 size 1200
+MD5 66d26f651f8aa39dbc8e905e8ce9d4dc files/xevil-2.02_p2-gcc41.patch 1200
+RMD160 748117fffab1a0192e24fb8080460af56a7b8b59 files/xevil-2.02_p2-gcc41.patch 1200
+SHA256 ae507aebe8d41bbf2efc79de510b8e4083217c6d8c3db382f4a7522f10d3e715 files/xevil-2.02_p2-gcc41.patch 1200
+DIST xevil_2.02r2-2.diff.gz 26096 RMD160 ff60fafb518a67656bcc83905beb421dbdafa4a5 SHA256 22e743cca5277daa8c93d54be0ca4ba0c37f992739fd5a38fac5578c83b5c865 size 26096
+DIST xevilsrc2.02r2.zip 1857315 RMD160 dca82298ac2dfe66e4e92a02731bb6851563b67e SHA256 45a72def6f7532bd4b7193932df09c1ba4eada2433382c494b37d4733e743188 size 1857315
+EBUILD xevil-2.02_p2.ebuild 1188 RMD160 699bdfd2212838a7f041b6d082dfcd69945b563b SHA1 0266b81a3297dcf14e2dc95283880b0b2051a8ac SHA256 3f36eb9eab563b62a9f0ff37ba0446331eefcce28f874bed6423047819b75049 size 1188
+MD5 9211d5978263eef239b322fba4f75f07 xevil-2.02_p2.ebuild 1188
+RMD160 699bdfd2212838a7f041b6d082dfcd69945b563b xevil-2.02_p2.ebuild 1188
+SHA256 3f36eb9eab563b62a9f0ff37ba0446331eefcce28f874bed6423047819b75049 xevil-2.02_p2.ebuild 1188
+MISC ChangeLog 952 RMD160 b8036f514bb25b371c6014747bc6bf819bbb046b SHA1 030173ab0c0844b19726288347ab9410b1a18932 SHA256 f33e1cdfd21e0f8e46e28b3b710aa5c94cb01fa2906602560dedcc090f2b9fd7 size 952
+MD5 c5d32e7a8ae3c092c94efc6ffe34d2d3 ChangeLog 952
+RMD160 b8036f514bb25b371c6014747bc6bf819bbb046b ChangeLog 952
+SHA256 f33e1cdfd21e0f8e46e28b3b710aa5c94cb01fa2906602560dedcc090f2b9fd7 ChangeLog 952
+MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 size 158
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 5782d4c7cef610466151c45846ad3d74 xevil-2.02_p2.ebuild 1160
-RMD160 1f0e72dc4928560673dc1d3151466c90e7ab6560 xevil-2.02_p2.ebuild 1160
-SHA256 9d5ee03ecb0194a93396ccc93b9d20ee94cb78ac047d43b84da2173b95ae57f4 xevil-2.02_p2.ebuild 1160
+MD5 2bd97114dbd86b5c844d8035118f45ba files/digest-xevil-2.02_p2 482
+RMD160 3c545e5d7a501ec5de0e0e84c91347ef078be36a files/digest-xevil-2.02_p2 482
+SHA256 20fc21e4cfc8b54fc1950d244f0ee87e21bb339d9bc5fe7db626e21f5079fcca files/digest-xevil-2.02_p2 482
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEUTyi2CTtIKiFlQIRAjPHAJ9tKfYBsGwZMG1p73+cB9cpH+feMACeNiF2
+4jf7fOToC5+ziUjJDczhpF8=
+=mprn
+-----END PGP SIGNATURE-----
diff --git a/games-arcade/xevil/files/digest-xevil-2.02_p2 b/games-arcade/xevil/files/digest-xevil-2.02_p2
index bbfd05f714f8..fa2b83ca4c7a 100644
--- a/games-arcade/xevil/files/digest-xevil-2.02_p2
+++ b/games-arcade/xevil/files/digest-xevil-2.02_p2
@@ -1,2 +1,6 @@
-MD5 09a9ef720b7204b0be68c4f462def370 xevilsrc2.02r2.zip 1857315
 MD5 de2ec493ad377cf9d2022f1f27806aec xevil_2.02r2-2.diff.gz 26096
+RMD160 ff60fafb518a67656bcc83905beb421dbdafa4a5 xevil_2.02r2-2.diff.gz 26096
+SHA256 22e743cca5277daa8c93d54be0ca4ba0c37f992739fd5a38fac5578c83b5c865 xevil_2.02r2-2.diff.gz 26096
+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-gcc41.patch b/games-arcade/xevil/files/xevil-2.02_p2-gcc41.patch
new file mode 100644
index 000000000000..06c3021e164a
--- /dev/null
+++ b/games-arcade/xevil/files/xevil-2.02_p2-gcc41.patch
@@ -0,0 +1,42 @@
+--- cmn/utils.cpp.old	2006-04-27 22:40:27.000000000 +0200
++++ cmn/utils.cpp	2006-04-27 22:40:40.000000000 +0200
+@@ -753,7 +753,7 @@
+ 
+ 
+ private:
+-  Bucket* HashTable::_get(int &index,void* key);
++  Bucket* _get(int &index,void* key);
+   /* MODIFIES: index */
+   /* EFFECTS: Internal helper function.  Return the Bucket containing key
+      or NULL if not found.  Set index to the bucket list for key whether
+--- cmn/locator.h.old	2006-04-27 22:46:53.000000000 +0200
++++ cmn/locator.h	2006-04-27 22:47:40.000000000 +0200
+@@ -96,6 +96,10 @@
+ #define OL_RECENT_SOUNDS_MAX 30
+ 
+ 
++class OLgridEntry; 
++#if X11
++class OLshadowEntry;
++#endif
+ 
+ // An entry for one object in the list of all objects currently in the game.
+ class OLentry {
+--- cmn/game.cpp.old	2006-04-27 23:43:10.000000000 +0200
++++ cmn/game.cpp	2006-04-27 23:43:55.000000000 +0200
+@@ -2252,7 +2252,6 @@
+               if (keysym != NoSymbol)
+                 right[n][which] = keysym;
+             }
+-            delete option;
+ 	      }
+ 	      
+ 	      { // Left Keys.
+@@ -2272,7 +2271,6 @@
+               if (keysym != NoSymbol)
+                 left[n][which] = keysym;
+             }
+-            delete option;
+ 	      }
+ 	    }
+ 
diff --git a/games-arcade/xevil/xevil-2.02_p2.ebuild b/games-arcade/xevil/xevil-2.02_p2.ebuild
index 98951ca30154..7ab1fee3fc73 100644
--- a/games-arcade/xevil/xevil-2.02_p2.ebuild
+++ b/games-arcade/xevil/xevil-2.02_p2.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.11 2006/01/29 00:00:28 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/xevil/xevil-2.02_p2.ebuild,v 1.12 2006/04/27 21:50:15 tupone Exp $
 
 inherit eutils games
 
@@ -25,7 +25,8 @@ 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
+	epatch ${WORKDIR}/xevil_${MY_PV}-${DEB_PATCH}.diff \
+		"${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e 's:-static::' \
 		-e "s:CFLAGS=\":CFLAGS=\"${CFLAGS} :g" \