Fix for gcc-4.1

Package-Manager: portage-2.1_pre10-r2

6 files changed, 343 insertions, 18 deletions

diff --git a/games-emulation/pcsx2/ChangeLog b/games-emulation/pcsx2/ChangeLog
index 6f75b200eb83..7e549c062bca 100644
--- a/games-emulation/pcsx2/ChangeLog
+++ b/games-emulation/pcsx2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-emulation/pcsx2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/ChangeLog,v 1.10 2006/02/11 19:55:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/ChangeLog,v 1.11 2006/05/02 21:53:46 tupone Exp $
+
+  02 May 2006; <Tupone@gentoo.org> +files/pcsx2-0.8.1-gcc41.patch,
+  pcsx2-0.8.1.ebuild:
+  Fix for gcc-4.1
 
   11 Feb 2006; Chris Gianelloni <wolf31o2@gentoo.org> pcsx2-0.6.ebuild,
   pcsx2-0.8.1.ebuild:
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index 5e7bac737d30..462c8f3368ac 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1,27 +1,50 @@
-MD5 071f4a450fb3f4610873273572fcabb3 ChangeLog 1359
-RMD160 0acad3cff42ffe735f428248fecd520ea723aa45 ChangeLog 1359
-SHA256 362d9bae4a03fb1f2dca021a99cd821af72617be8f31ce9f93837c251c2d9ea4 ChangeLog 1359
-MD5 7824dc74e2dffea379d9aa075d6dbecd files/digest-pcsx2-0.6 62
-RMD160 9867ae2491593c2c00fb1b0dcfa146d3357eba6c files/digest-pcsx2-0.6 62
-SHA256 490c464c6cbce2ee67812eb6d740f5990de5005abfa9c0b6731944223a49af8c files/digest-pcsx2-0.6 62
-MD5 7f767cd968c92287092f1677b680d93c files/digest-pcsx2-0.8.1 62
-RMD160 3ec9ccdffe180be3eb122622d9922dc7c25f8746 files/digest-pcsx2-0.8.1 62
-SHA256 aff346bacc24ed8d1ab376c17323ff8b208d7047f2c18253484b75b50c0d4bf1 files/digest-pcsx2-0.8.1 62
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pcsx2 1368 RMD160 3407c02be76a222d865ec085a37749ac42f5a61b SHA1 09433935554438fb98431b769af7035ee6d47def SHA256 74bade1a1a86a8573cfbe7dd6ae974e0bcd6b689edb67fb20222fe8660c09614 size 1368
 MD5 4bdc90cba4d2039218051770ee1fff2f files/pcsx2 1368
 RMD160 3407c02be76a222d865ec085a37749ac42f5a61b files/pcsx2 1368
 SHA256 74bade1a1a86a8573cfbe7dd6ae974e0bcd6b689edb67fb20222fe8660c09614 files/pcsx2 1368
+AUX pcsx2-0.8.1-amd64.patch 609 RMD160 4eb85b8e5dbd437f0e81abba13236f4df5e4b9f8 SHA1 1ca96611b84984e1ad7af397c7ebe284c9a4b99e SHA256 71bbd86422b251f01749152649e7ef21b7b2564ab4c540d0ba13659b73f895d5 size 609
 MD5 4117c94231158b69fecb21aa7f049626 files/pcsx2-0.8.1-amd64.patch 609
 RMD160 4eb85b8e5dbd437f0e81abba13236f4df5e4b9f8 files/pcsx2-0.8.1-amd64.patch 609
 SHA256 71bbd86422b251f01749152649e7ef21b7b2564ab4c540d0ba13659b73f895d5 files/pcsx2-0.8.1-amd64.patch 609
+AUX pcsx2-0.8.1-gcc41.patch 9314 RMD160 5cff9098516b7d3b9ac4b4eca3a8c3dfe58132c0 SHA1 db9f00476feabace323990492519264adfbea2fe SHA256 ca3a8e3c9dea5758b3694402be38cf7e1504f0413b2f91e147494173c44e296b size 9314
+MD5 374ecf00799c2aebe279ff4ffdbce384 files/pcsx2-0.8.1-gcc41.patch 9314
+RMD160 5cff9098516b7d3b9ac4b4eca3a8c3dfe58132c0 files/pcsx2-0.8.1-gcc41.patch 9314
+SHA256 ca3a8e3c9dea5758b3694402be38cf7e1504f0413b2f91e147494173c44e296b files/pcsx2-0.8.1-gcc41.patch 9314
+AUX pcsx2.png 11497 RMD160 41325b141e0ddfb94a6b6ccd743c665c61ed2ec5 SHA1 3a8dfdbc844c29b2de3eb280c4e3b07bebd03109 SHA256 7c9be27c134253dcb8431fa339bf284da875ba280342a764cb66b3aafe21c2b4 size 11497
 MD5 98a9029664c06eed7f435badf6397b4d files/pcsx2.png 11497
 RMD160 41325b141e0ddfb94a6b6ccd743c665c61ed2ec5 files/pcsx2.png 11497
 SHA256 7c9be27c134253dcb8431fa339bf284da875ba280342a764cb66b3aafe21c2b4 files/pcsx2.png 11497
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
-SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+DIST pcsx2-0.8.1src.7z 551500 RMD160 b9241ad6c59a5e62ff556ac5935dec93dca77875 SHA256 473f6e278c51770260174026d5c26183dd3ae0083c905a9bedfc2c56321d99e1 size 551500
+DIST pcsx2_0.6src.zip 1207739 RMD160 f4db133106cbe6d83899343c015ef35968b98e86 SHA256 1a07aa7b00fade7f8f57dec9d631b5e3a2efe415a8c72c64ef8da6ea6db45217 size 1207739
+EBUILD pcsx2-0.6.ebuild 1519 RMD160 1b6450f73ef45589cb390acc0ac17c139d43a718 SHA1 ade768c35390a322a5e548d4ecd3b46b7b3dad92 SHA256 1ff761792b0cddfb04a11b178b31fe725d89781ee72c87cd86613aa28d274f1d size 1519
 MD5 5b5447328bc0661e648a0af74a0fa489 pcsx2-0.6.ebuild 1519
 RMD160 1b6450f73ef45589cb390acc0ac17c139d43a718 pcsx2-0.6.ebuild 1519
 SHA256 1ff761792b0cddfb04a11b178b31fe725d89781ee72c87cd86613aa28d274f1d pcsx2-0.6.ebuild 1519
-MD5 426a61594cefc8ab88eaf80ac78e50bb pcsx2-0.8.1.ebuild 1639
-RMD160 2c890cb40b853ba7643e1a73b5dcc5b5b448f30e pcsx2-0.8.1.ebuild 1639
-SHA256 eeb11ccd5fd8f32cf1c9156be6c152d50a38cd7adb568d4f63552b89684ad8c5 pcsx2-0.8.1.ebuild 1639
+EBUILD pcsx2-0.8.1.ebuild 1672 RMD160 5f43a92836d54ba52aa14d203391ccdee0be5f49 SHA1 7bf4b3784ff585eb04457f7909d08129c1f2c2a8 SHA256 cacec8c5d6464e60cc6f7d538857b8b00fb284bbba864bf396de59343c21b28b size 1672
+MD5 776ee71ff379d8f9871d362112188665 pcsx2-0.8.1.ebuild 1672
+RMD160 5f43a92836d54ba52aa14d203391ccdee0be5f49 pcsx2-0.8.1.ebuild 1672
+SHA256 cacec8c5d6464e60cc6f7d538857b8b00fb284bbba864bf396de59343c21b28b pcsx2-0.8.1.ebuild 1672
+MISC ChangeLog 1465 RMD160 af432795e4314f5c0dd93f445a5956cb6af5762f SHA1 12c4009c739c560f50607fc1b9f7d8e7e7335296 SHA256 07f36246f90e5fcce9c4907820fc2e668d635c6c9255e539930814138b472506 size 1465
+MD5 523d099c70f4b6376f282ed004201bf6 ChangeLog 1465
+RMD160 af432795e4314f5c0dd93f445a5956cb6af5762f ChangeLog 1465
+SHA256 07f36246f90e5fcce9c4907820fc2e668d635c6c9255e539930814138b472506 ChangeLog 1465
+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 773c044cd83ae528a5f92b5f6e8e61ec files/digest-pcsx2-0.6 232
+RMD160 4478fc858597d284c023fde1704c6eb4e011ad2b files/digest-pcsx2-0.6 232
+SHA256 8e081a00151cc47ea3bb5ca2dd5b4aba7208e9651c58c392c57757feddf34b65 files/digest-pcsx2-0.6 232
+MD5 f1b344251b37c71845451aa74b34adf9 files/digest-pcsx2-0.8.1 232
+RMD160 cdb0a74c854a12988962ad993188c5b5a7750c63 files/digest-pcsx2-0.8.1 232
+SHA256 a5adc7e2e12f2a0d9c0a876241ca2cd8ce7fc530581374a7829a15f3dd0d3aee files/digest-pcsx2-0.8.1 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEV9T42CTtIKiFlQIRAiSyAJ0QPKvakxVa1ee9WXKpNnYYGDRtbQCfTihq
+iaUcgkl8HfIeEff7zAYPZtg=
+=r+7W
+-----END PGP SIGNATURE-----
diff --git a/games-emulation/pcsx2/files/digest-pcsx2-0.6 b/games-emulation/pcsx2/files/digest-pcsx2-0.6
index 50f033709722..3026d7fff353 100644
--- a/games-emulation/pcsx2/files/digest-pcsx2-0.6
+++ b/games-emulation/pcsx2/files/digest-pcsx2-0.6
@@ -1 +1,3 @@
 MD5 f2c33ea25514a773f5b8fef301bce787 pcsx2_0.6src.zip 1207739
+RMD160 f4db133106cbe6d83899343c015ef35968b98e86 pcsx2_0.6src.zip 1207739
+SHA256 1a07aa7b00fade7f8f57dec9d631b5e3a2efe415a8c72c64ef8da6ea6db45217 pcsx2_0.6src.zip 1207739
diff --git a/games-emulation/pcsx2/files/digest-pcsx2-0.8.1 b/games-emulation/pcsx2/files/digest-pcsx2-0.8.1
index 71e02b96fe8b..f68cf4b730f8 100644
--- a/games-emulation/pcsx2/files/digest-pcsx2-0.8.1
+++ b/games-emulation/pcsx2/files/digest-pcsx2-0.8.1
@@ -1 +1,3 @@
 MD5 25ce544329c34b520a664af5206f8e44 pcsx2-0.8.1src.7z 551500
+RMD160 b9241ad6c59a5e62ff556ac5935dec93dca77875 pcsx2-0.8.1src.7z 551500
+SHA256 473f6e278c51770260174026d5c26183dd3ae0083c905a9bedfc2c56321d99e1 pcsx2-0.8.1src.7z 551500
diff --git a/games-emulation/pcsx2/files/pcsx2-0.8.1-gcc41.patch b/games-emulation/pcsx2/files/pcsx2-0.8.1-gcc41.patch
new file mode 100644
index 000000000000..eba8cc72ce6a
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-0.8.1-gcc41.patch
@@ -0,0 +1,293 @@
+--- FiFo.c.old	2006-05-02 22:31:47.000000000 +0200
++++ FiFo.c	2006-05-02 22:39:29.000000000 +0200
+@@ -61,6 +61,7 @@
+ void fifo_get3(struct fifo *fifo, void *value, u32 size, int type){
+ 	struct item * p;
+ 	register u32 q;
++	u8* u8Value;
+ 	if ( value == NULL ) return;
+ 	
+ 	if(fifo->first->next == NULL) memset(value, 0, size);
+@@ -72,7 +73,8 @@
+ 			q = min(p->size - fifo->used, size);
+ 			memcpy(value,(u8*)p->data + fifo->used, q);
+ 			size -= q;
+-			(u8*)value += q;
++			u8Value = (u8*)value + q;
++			value = u8Value;
+ 			if(type)
+ 			{
+ 				fifo->count -= q;
+@@ -94,6 +96,7 @@
+ void fifo_get(struct fifo *fifo, void *value, u32 size){
+ 	struct item *p;
+ 	register u32 q;
++	u8* u8Value;
+ 	
+ 	if (value==NULL)	return;
+ 
+@@ -107,7 +110,8 @@
+ 			fifo->used+=q;
+ 			fifo->count-=q;
+ 			size-=q;
+-			(u8*)value+=q;
++			u8Value = (u8*)value + q;
++			value = u8Value;
+ 			if (fifo->used>=p->size){
+ 				fifo->used=0;
+ 				fifo->first->next=p->next;
+@@ -124,6 +128,7 @@
+ void fifo_get2(struct fifo *fifo, void *value, u32 size){
+ 	struct item *p;
+ 	register u32 q;
++	u8* u8Value;
+ 
+ 	if (value==NULL)	return;
+ 
+@@ -135,7 +140,8 @@
+ 			q=min(p->size-fifo->used, size);
+ 			memcpy(value, (u8*)p->data+fifo->used, q);
+ 			size-=q;
+-			(u8*)value+=q;
++			u8Value = (u8*)value + q;
++			value = u8Value;
+ 			p=fifo->first->next;
+ 		}
+ 		memset(value, 0, size);
+--- CDVDiso.c.old	2006-05-02 22:44:47.000000000 +0200
++++ CDVDiso.c	2006-05-02 23:29:19.000000000 +0200
+@@ -198,7 +198,7 @@
+ //			case CdSecS2064:
+ 				((u32*)buf)[0] = i + 0x30000;
+ 				memcpy((u8*)buf+12, buff, 2048); 
+-				(u8*)buf+= 2064; break;
++				buf+= 2064; break;
+ //			default:
+ //				return 0;
+ //		}
+@@ -300,14 +300,13 @@
+ 	//CdSync(0x00);
+ 
+ 	// point the tocEntryPointer at the first real toc entry
+-	(char*)tocEntryPointer = toc;
++	tocEntryPointer = (struct dirTocEntry *)toc;
+ 
+ 	num_dir_sectors = (tocEntryPointer->fileSize+2047) >> 11;	//round up fix
+ 	current_sector = tocEntryPointer->fileLBA;
+ 
+-	(char*)tocEntryPointer += tocEntryPointer->length;
+-	(char*)tocEntryPointer += tocEntryPointer->length;
+-
++	tocEntryPointer = (struct dirTocEntry *)((char *)tocEntryPointer + tocEntryPointer->length);
++	tocEntryPointer = (struct dirTocEntry *)((char *)tocEntryPointer + tocEntryPointer->length);
+ 
+ 	localTocEntry.fileLBA = CDVolDesc.rootToc.tocLBA;
+ 	// while (there are more dir names in the path)
+@@ -360,7 +359,7 @@
+ 					}
+ //					CdSync(0x00);
+ 
+-					(char*)tocEntryPointer = toc;
++					tocEntryPointer = (struct dirTocEntry *)toc;
+ 				}
+ 				else
+ 				{
+@@ -385,7 +384,7 @@
+ 			}
+ 
+ 			// point to the next entry
+-			(char*)tocEntryPointer += tocEntryPointer->length;
++			tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 		}
+ 
+ 		// If we havent found the directory name we wanted then fail
+@@ -410,23 +409,23 @@
+ 		current_sector = localTocEntry.fileLBA;
+ 
+ 		// and point the tocEntryPointer at the first real toc entry
+-		(char*)tocEntryPointer = toc;
+-		(char*)tocEntryPointer += tocEntryPointer->length;
+-		(char*)tocEntryPointer += tocEntryPointer->length;
++		tocEntryPointer = (struct dirTocEntry *)toc;
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 	}
+ 
+ #ifdef DEBUG
+ 	printf("CDVD_findfile: found dir, now looking for file\n");
+ #endif
+ 
+-	(char*)tocEntryPointer = toc;
++	tocEntryPointer = (struct dirTocEntry *)toc;
+ 
+ 	num_dir_sectors = (tocEntryPointer->fileSize+2047) >> 11;	//round up fix
+ 	dir_lba = tocEntryPointer->fileLBA;
+ 
+-	(char*)tocEntryPointer = toc;
+-	(char*)tocEntryPointer += tocEntryPointer->length;
+-	(char*)tocEntryPointer += tocEntryPointer->length;
++	tocEntryPointer = (struct dirTocEntry *)toc;
++	tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
++	tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 
+ 	while (num_dir_sectors > 0)
+ 	{
+@@ -455,7 +454,7 @@
+ 				return TRUE;
+ 			}
+ 
+-			(char*)tocEntryPointer += tocEntryPointer->length;
++			tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 		}
+ 
+ 		num_dir_sectors--;
+@@ -470,7 +469,7 @@
+ 			}
+ //			CdSync(0x00);
+ 
+-			(char*)tocEntryPointer = toc;
++			tocEntryPointer = (struct dirTocEntry *) toc;
+ 		}
+ 	}
+ 
+@@ -521,13 +520,13 @@
+ 	//CdSync(0x00);
+ 
+ 	// point the tocEntryPointer at the first real toc entry
+-	(char*)tocEntryPointer = toc;
++	tocEntryPointer = (struct dirTocEntry *)toc;
+ 
+ 	num_dir_sectors = (tocEntryPointer->fileSize+2047) >> 11;
+ 	current_sector = tocEntryPointer->fileLBA;
+ 
+-	(char*)tocEntryPointer += tocEntryPointer->length;
+-	(char*)tocEntryPointer += tocEntryPointer->length;
++	tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
++	tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 
+ 	// use strtok to get the next dir name
+ 
+@@ -563,7 +562,7 @@
+ 					}
+ 					//CdSync(0x00);
+ 
+-					(char*)tocEntryPointer = toc;
++					tocEntryPointer = (struct dirTocEntry *)toc;
+ 				}
+ 				else{
+ 					// Couldnt find the directory, and got to end of directory
+@@ -588,7 +587,7 @@
+ 			}
+ 
+ 			// point to the next entry
+-			(char*)tocEntryPointer += tocEntryPointer->length;
++			tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 		}
+ 
+ 		// If we havent found the directory name we wanted then fail
+@@ -611,9 +610,9 @@
+ 		current_sector = localTocEntry.fileLBA;
+ 
+ 		// and point the tocEntryPointer at the first real toc entry
+-		(char*)tocEntryPointer = toc;
+-		(char*)tocEntryPointer += tocEntryPointer->length;
+-		(char*)tocEntryPointer += tocEntryPointer->length;
++		tocEntryPointer = (struct dirTocEntry *)toc;
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 	}
+ 
+ 	// We know how much data we need to read in from the DirTocHeader
+@@ -625,7 +624,7 @@
+ 	// This is a bit of a waste of reads since we're not actually copying the data out yet,
+ 	// but we dont know how big this TOC might be, so we cant allocate a specific size
+ 
+-	(char*)tocEntryPointer = toc;
++	tocEntryPointer = (struct dirTocEntry *)toc;
+ 
+ 	// Need to STORE the start LBA and number of Sectors, for use by the retrieve func.
+ 	getDirTocData.start_LBA = localTocEntry.fileLBA;
+@@ -637,9 +636,9 @@
+ 
+ 	num_dir_sectors = getDirTocData.num_sectors;
+ 
+-	(char*)tocEntryPointer = toc;
+-	(char*)tocEntryPointer += tocEntryPointer->length;
+-	(char*)tocEntryPointer += tocEntryPointer->length;
++	tocEntryPointer = (struct dirTocEntry *)toc;
++	tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
++	tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 
+ 	toc_entry_num=0;
+ 
+@@ -661,7 +660,7 @@
+ 				}
+ 				//CdSync(0x00);
+ 
+-				(char*)tocEntryPointer = toc;
++				tocEntryPointer = (struct dirTocEntry *)toc;
+ 
+ //				continue;
+ 			}
+@@ -694,7 +693,7 @@
+ 			}
+ 		}
+ 
+-		(char*)tocEntryPointer += tocEntryPointer->length;
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 
+ 	}
+ 
+@@ -731,14 +730,14 @@
+ 
+ 	if (getDirTocData.current_entry == 0){
+ 		// if this is the first read then make sure we point to the first real entry
+-		(char*)tocEntryPointer = toc;
+-		(char*)tocEntryPointer += tocEntryPointer->length;
+-		(char*)tocEntryPointer += tocEntryPointer->length;
++		tocEntryPointer = (struct dirTocEntry *)toc;
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
++		tocEntryPointer = (struct dirTocEntry *) ((char *)tocEntryPointer + tocEntryPointer->length);
+ 
+ 		getDirTocData.current_sector_offset = (char*)tocEntryPointer - toc;
+ 	}
+ 	else{
+-		(char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
++		tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
+ 	}
+ 
+ 	if (req_entries > 128)
+@@ -763,7 +762,7 @@
+ 				//CdSync(0x00);
+ 
+ 				getDirTocData.current_sector_offset = 0;
+-				(char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
++				tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
+ 
+ //				continue;
+ 			}
+@@ -789,7 +788,7 @@
+ 			}
+ 
+ 			getDirTocData.current_sector_offset += tocEntryPointer->length;
+-			(char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
++			tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
+ 		}
+ 		else{
+ 			if (strlen(getDirTocData.extension_list) > 0){
+@@ -799,13 +798,13 @@
+ 				}
+ 
+ 				getDirTocData.current_sector_offset += tocEntryPointer->length;
+-				(char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
++				tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
+ 
+ 			}
+ 			else{
+ 				toc_entry_num++;
+ 				getDirTocData.current_sector_offset += tocEntryPointer->length;
+-				(char*)tocEntryPointer = toc + getDirTocData.current_sector_offset;
++				tocEntryPointer = (struct dirTocEntry *)(toc + getDirTocData.current_sector_offset);
+ 			}
+ 		}
+ /*
diff --git a/games-emulation/pcsx2/pcsx2-0.8.1.ebuild b/games-emulation/pcsx2/pcsx2-0.8.1.ebuild
index f06c99e4fe4b..b9fc7aba6357 100644
--- a/games-emulation/pcsx2/pcsx2-0.8.1.ebuild
+++ b/games-emulation/pcsx2/pcsx2-0.8.1.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-emulation/pcsx2/pcsx2-0.8.1.ebuild,v 1.6 2006/02/11 19:55:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/pcsx2/pcsx2-0.8.1.ebuild,v 1.7 2006/05/02 21:53:46 tupone Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -31,7 +31,8 @@ S=${WORKDIR}/${P}src
 src_unpack() {
 	7z x "${DISTDIR}/${P}src.7z" || die "unpack failed"
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-amd64.patch
+	epatch "${FILESDIR}"/${P}-amd64.patch \
+		"${FILESDIR}/${P}"-gcc41.patch
 	sed -i \
 		-e '/^CC/d' \
 		-e "/^CPU/s:=.*:=$(tc-arch-kernel):" \