Modular X dep fix; gcc-3.4 compilation fix: Bug #99756 reported by Triffid Hunter

Package-Manager: portage-2.1_pre5-r4

5 files changed, 74 insertions, 10 deletions

diff --git a/games-fps/avp-cvs/ChangeLog b/games-fps/avp-cvs/ChangeLog
index 51cd3f4f7642..49ac3c833d9a 100644
--- a/games-fps/avp-cvs/ChangeLog
+++ b/games-fps/avp-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/avp-cvs
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/avp-cvs/ChangeLog,v 1.8 2005/07/21 17:09:26 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/avp-cvs/ChangeLog,v 1.9 2006/03/09 22:57:03 tupone Exp $
+
+  09 Mar 2006; <Tupone@gentoo.org> +files/avp-cvs-20031110-gcc34.patch,
+  avp-cvs-20031110.ebuild:
+  Modular X dependency fix
+  Fix gcc-3.4 bug (#99756), thanks Triffid Hunter for report.
 
   21 Jul 2005; Michael Sterrett <mr_bones_@gentoo.org>
   avp-cvs-20031110.ebuild:
diff --git a/games-fps/avp-cvs/Manifest b/games-fps/avp-cvs/Manifest
index fb59765f1da9..adf4c4518dd9 100644
--- a/games-fps/avp-cvs/Manifest
+++ b/games-fps/avp-cvs/Manifest
@@ -1,4 +1,15 @@
+MD5 b083439183aaf21af99ae0b474431403 ChangeLog 1330
+RMD160 761f2460472fe07aed0299292598e345f0d229d8 ChangeLog 1330
+SHA256 944b0e766956c8eb2808366fa2a21d6c66c8b1d45001e8ee592dfb1d4c1100da ChangeLog 1330
+MD5 c34b3b7d97d355a1c20865178f01084c avp-cvs-20031110.ebuild 1374
+RMD160 f9b56e748007d2218bbb9c6af7681447a68f99b3 avp-cvs-20031110.ebuild 1374
+SHA256 2c0447aaba1047ad55e002497e5be80d638108719249d91412ede1af62d6776b avp-cvs-20031110.ebuild 1374
+MD5 b816fec413a9baaca535625132ffb7a0 files/avp-cvs-20031110-gcc34.patch 1405
+RMD160 f93111cb38b73671d447944aad148589bd579a16 files/avp-cvs-20031110-gcc34.patch 1405
+SHA256 39b83a89a6e7c74e1e291c1989f5b1a579095c2058db46b86edcc808629b37f3 files/avp-cvs-20031110-gcc34.patch 1405
+MD5 820a03c878452c5af062656cf1c0677c files/digest-avp-cvs-20031110 244
+RMD160 c55bd4fdc7bf44a8edc6b0f89a301e653bdae503 files/digest-avp-cvs-20031110 244
+SHA256 2605bcb0e21bddfb1000fc67232b59cde9229d91a171dbeb74d34f7ba2a27c99 files/digest-avp-cvs-20031110 244
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 95de2fa3cdbd63809fdf6ab62354ef4a avp-cvs-20031110.ebuild 1344
-MD5 9ba40526903c17685ba17b5471c3c27e ChangeLog 1144
-MD5 33255293ed4090137b6694a257d4029d files/digest-avp-cvs-20031110 66
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
diff --git a/games-fps/avp-cvs/avp-cvs-20031110.ebuild b/games-fps/avp-cvs/avp-cvs-20031110.ebuild
index fd23dbff98b8..9744eb6c2b4d 100644
--- a/games-fps/avp-cvs/avp-cvs-20031110.ebuild
+++ b/games-fps/avp-cvs/avp-cvs-20031110.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/avp-cvs/avp-cvs-20031110.ebuild,v 1.11 2005/07/21 17:09:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/avp-cvs/avp-cvs-20031110.ebuild,v 1.12 2006/03/09 22:57:03 tupone Exp $
 
 #ECVS_SERVER="icculus.org:/cvs/cvsroot"
 ECVS_PASS="anonymous"
 ECVS_MODULE="avp"
-inherit cvs games
+inherit eutils cvs games
 
 DESCRIPTION="Linux port of Aliens vs Predator"
 HOMEPAGE="http://www.icculus.org/avp/"
@@ -16,8 +16,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	media-libs/openal
+DEPEND="media-libs/openal
 	media-libs/libsdl"
 
 S=${WORKDIR}/${ECVS_MODULE}
@@ -42,6 +41,7 @@ src_unpack() {
 	sed -i \
 		-e "/^CFLAGS =/s:=.*:=${CFLAGS}:" Makefile \
 		|| die "sed Makefile failed"
+	epatch "${FILESDIR}/${P}-gcc34.patch"
 }
 
 src_install() {
diff --git a/games-fps/avp-cvs/files/avp-cvs-20031110-gcc34.patch b/games-fps/avp-cvs/files/avp-cvs-20031110-gcc34.patch
new file mode 100644
index 000000000000..f8f2bd32cf44
--- /dev/null
+++ b/games-fps/avp-cvs/files/avp-cvs-20031110-gcc34.patch
@@ -0,0 +1,46 @@
+--- win95/hash_tem.hpp.original	2006-03-09 23:04:02.000000000 +0100
++++ win95/hash_tem.hpp	2006-03-09 23:28:20.000000000 +0100
+@@ -432,24 +432,25 @@
+ 				// remove the current entry pointed to, advancing to the next
+ 				void Remove()
+ 				{
+-					if (!nEntriesRemaining)
++					if (!ConstIterator::nEntriesRemaining)
+ 					{
+ 						HT_FAIL("HTT: Tried to Remove() via an iterator which was Done()");
+ 					}
+-					Node * oldP = *nodePP;
+-					*nodePP = oldP->nextP;
++					Node * oldP = *ConstIterator::nodePP;
++					*ConstIterator::nodePP = oldP->nextP;
+ 					delete oldP;
+-					if (!*nodePP)
++					if (!*ConstIterator::nodePP)
+ 					{
+ 						do
+ 						{
+-							++ chainPP;
+-							-- nChainsRemaining;
++							++ ConstIterator::chainPP;
++							-- ConstIterator::nChainsRemaining;
+ 						}
+-						while (nChainsRemaining && !*chainPP);
+-						nodePP = chainPP;
++						while (ConstIterator::nChainsRemaining
++						       && !*ConstIterator::chainPP);
++						ConstIterator::nodePP = ConstIterator::chainPP;
+ 					}
+-					-- nEntriesRemaining;
++					-- ConstIterator::nEntriesRemaining;
+ 					-- *tableNEntriesP;
+ 				}
+ 
+@@ -702,7 +703,7 @@
+ 
+ 	
+ //	for(HashTable<TYPE>::ConstIterator it(ht); !it.Done(); it.Next() )
+-	for (_base_HashTable::ConstIterator it(ht); !it.Done(); it.Next() )
++	for (typename _base_HashTable::ConstIterator it(ht); !it.Done(); it.Next() )
+ 	{
+ 		AddRegardless( it.Get() );
+ 	}
diff --git a/games-fps/avp-cvs/files/digest-avp-cvs-20031110 b/games-fps/avp-cvs/files/digest-avp-cvs-20031110
index 6146f521fd42..71be5f882071 100644
--- a/games-fps/avp-cvs/files/digest-avp-cvs-20031110
+++ b/games-fps/avp-cvs/files/digest-avp-cvs-20031110
@@ -1 +1,3 @@
 MD5 b615009c05baf5ad53cc1a2ae7eb587c avp-20031110.tar.bz2 1502637
+RMD160 b8b90f6608d9a824eb88da83f6f0cf086f62fd40 avp-20031110.tar.bz2 1502637
+SHA256 d4f14eae1ea9e81fd170ecf05ae7e281b5b1fdc95ac9787eed03357c76dc77a7 avp-20031110.tar.bz2 1502637