version bump; clean old

Package-Manager: portage-2.1.6.7/cvs/Linux i686

7 files changed, 42 insertions, 884 deletions

diff --git a/games-strategy/scorched3d/ChangeLog b/games-strategy/scorched3d/ChangeLog
index 41b9c7842680..e6c11f584a8e 100644
--- a/games-strategy/scorched3d/ChangeLog
+++ b/games-strategy/scorched3d/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for games-strategy/scorched3d
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.61 2009/02/23 22:57:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/ChangeLog,v 1.62 2009/03/03 17:59:07 mr_bones_ Exp $
+
+*scorched3d-42.1 (03 Mar 2009)
+
+  03 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/scorched3d-42-amd64.patch, -files/scorched3d-42-gcc43.patch,
+  +files/scorched3d-42.1-fixups.patch, +files/scorched3d-42.1-gcc43.patch,
+  -files/scorched3d-42-fixups.patch, -scorched3d-42.ebuild,
+  +scorched3d-42.1.ebuild:
+  version bump; clean old
 
   23 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org>
   +files/scorched3d-42-amd64.patch, scorched3d-42.ebuild:
diff --git a/games-strategy/scorched3d/Manifest b/games-strategy/scorched3d/Manifest
index ff57d38ef198..12d4805574d1 100644
--- a/games-strategy/scorched3d/Manifest
+++ b/games-strategy/scorched3d/Manifest
@@ -1,10 +1,9 @@
 AUX scorched3d-41.3-gcc43.patch 1822 RMD160 1ec0e6808f78e3431fd2c7634774943a55a7b4d0 SHA1 42a92eae55440f7da3c2c60278686515ab217fcd SHA256 7430531c43b80f9cd4331c245297e1428efd0623347a0050bb4d8ef61156f87d
-AUX scorched3d-42-amd64.patch 30449 RMD160 732cdaeb7c6895e24e199d7c9a5a652c8f176cee SHA1 1ee10c8dd75d53e344fbcbc16ce1033605292a36 SHA256 f1529244331809b5c51a69da369e0ea038bc1c0f50f530f4fe5b30aafe31a4dc
-AUX scorched3d-42-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934
-AUX scorched3d-42-gcc43.patch 3969 RMD160 6125222e3f556f03cf04f8837d26bf3935c0901f SHA1 91e399cf8881a0ce264d4cf5656684138c14245f SHA256 a8985f7a10569908ffa0e268c988a51e9f56eea9cbb842211f06d20d4ceec504
+AUX scorched3d-42.1-fixups.patch 1967 RMD160 d06d0c20c5e65907a680ba39ebbbc57ee14a25cb SHA1 d13d821bca8c342bf04d5de0f5925649890c18c4 SHA256 7487d6708bfe250925cd7b425e200e5f566920c4fbb0376e3a5922bd60828934
+AUX scorched3d-42.1-gcc43.patch 875 RMD160 b52c37c3210c5ea0629f5f00283a4a63fa5c3561 SHA1 6be351b7b56206d8540c0938e06759cc6ee0c0e2 SHA256 f139415a4deca70dc0ad087ce6714359d4076df89228e7ea1e61aa100e0558c8
 DIST Scorched3D-41.3-src.tar.gz 60672892 RMD160 517689d2fd8c9d03a975e8fdc396c235de08c144 SHA1 c38fa05ca801b484c859012086dbbc03244ae71c SHA256 a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
-DIST Scorched3D-42-src.tar 166389760 RMD160 8e0a5add29adf604a431e28119f44b0fd5a56611 SHA1 30e245fc0fbd52026ee5885c82488f5126edd6a9 SHA256 b9576223396b15e3cf55d005cd48dcfa32f7481f85d7ef8d16ac070c38bdc233
+DIST Scorched3D-42.1-src.tar.gz 64491145 RMD160 ed8a621875d19eb4d7314293439f4c2a0b5a5276 SHA1 041e3b3dd47a7881738eb5d66885d7f339eb01ce SHA256 884eccfed5fda58c140c4a593806c0c366a695660c47cdd4ea8d96189189106e
 EBUILD scorched3d-41.3-r1.ebuild 1808 RMD160 2c5cda4b5587393e3b71a6f6aa99da9b38c5967f SHA1 1beb80ad2df2f2b389e6bf68f72b248b5a714657 SHA256 a7ea93c29fdfb63688c2725499f429ecfac6b87c4ddd8540dc7813f4c8c683cf
-EBUILD scorched3d-42.ebuild 1614 RMD160 62bd802d5dd2abc6070e71849466005c3524b637 SHA1 37990d301dfa30fb383760de171df9b82a40c759 SHA256 26298ce702abc0fcd98e5f8230fd5e45ea260b5dbbef582077643032046c4f27
-MISC ChangeLog 8352 RMD160 bcab4615a46c18f24229390f30cd903e3ce9fab1 SHA1 bad2f07defdaedba8e29b71a7189ee010686734e SHA256 cc82e689ff11e15347dae0b7390171f53a3d853d5e53edc4ae31f09efa30e50d
+EBUILD scorched3d-42.1.ebuild 1553 RMD160 7fadf8806c73bcbf1d1f988305e1a943923e3e74 SHA1 7b77d16a989b4841752876c6cc448beabb1a977f SHA256 29def09fd2790b7bb51d72fece00585a67af2494208b6391679123deaa6ca7bb
+MISC ChangeLog 8698 RMD160 d1e592320d47eeba21a1e896a998f0bc6a086c40 SHA1 78d23eed1ac2038f54d816648db3ec85d8eb4db6 SHA256 de76c4688184020b6db425894b2879b5fef19cabd00dbcfdaa15b56d8c210549
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-strategy/scorched3d/files/scorched3d-42-amd64.patch b/games-strategy/scorched3d/files/scorched3d-42-amd64.patch
deleted file mode 100644
index df17735f0fb4..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-42-amd64.patch
+++ /dev/null
@@ -1,772 +0,0 @@
-diff -ur scorched_old/src/client/GLEXT/GLFont2d.cpp scorched/src/client/GLEXT/GLFont2d.cpp
---- scorched_old/src/client/GLEXT/GLFont2d.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/GLEXT/GLFont2d.cpp	2009-02-23 15:21:52.000000000 +0100
-@@ -122,7 +122,7 @@
- 	float x, float y, float z, 

- 	const LangString &text)

- {

--	int slen = text.size();

-+	int slen = (int) text.size();

- 	if (slen > 0)

- 	{

- 		int l = 0;

-diff -ur scorched_old/src/client/GLEXT/GLImageModifier.cpp scorched/src/client/GLEXT/GLImageModifier.cpp
---- scorched_old/src/client/GLEXT/GLImageModifier.cpp	2009-01-15 18:32:11.000000000 +0100
-+++ scorched/src/client/GLEXT/GLImageModifier.cpp	2009-02-23 15:21:52.000000000 +0100
-@@ -455,7 +455,7 @@
- 	sources.push_back(&slopeBitmap);

- 	sources.push_back(&shoreBitmap);

- 

--	int currentCount = sources.size();

-+	int currentCount = (int) sources.size();

- 	for (int i=currentCount; i<9; i++)

- 	{

- 		sources.push_back(&shoreBitmap);

-diff -ur scorched_old/src/client/GLW/GLWPanel.cpp scorched/src/client/GLW/GLWPanel.cpp
---- scorched_old/src/client/GLW/GLWPanel.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/GLW/GLWPanel.cpp	2009-02-23 15:21:53.000000000 +0100
-@@ -468,7 +468,7 @@
- 

- 		w = 0.0f;

- 		for (unsigned int i=0; i<gridWidth_; i++) w += gridW[i];

--		int rows = widgets_.size() / gridWidth_;

-+		int rows = (int) widgets_.size() / gridWidth_;

- 		if (widgets_.size() % gridWidth_ > 0) rows ++;

- 		h *= rows;

- 	}

-diff -ur scorched_old/src/client/GLW/GLWTextBox.cpp scorched/src/client/GLW/GLWTextBox.cpp
---- scorched_old/src/client/GLW/GLWTextBox.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/GLW/GLWTextBox.cpp	2009-02-23 15:21:53.000000000 +0100
-@@ -110,7 +110,7 @@
- 				if (entry.widget->getMetaClassId() == getMetaClassId())

- 				{

- 					GLWTextBox *textBox = (GLWTextBox *) entry.widget;

--					if (this == textBox) position = textBoxes.size();

-+					if (this == textBox) position = (unsigned int) textBoxes.size();

- 					textBoxes.push_back(textBox);

- 				}

- 			}

-diff -ur scorched_old/src/client/GLW/GLWTime.cpp scorched/src/client/GLW/GLWTime.cpp
---- scorched_old/src/client/GLW/GLWTime.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/GLW/GLWTime.cpp	2009-02-23 15:21:53.000000000 +0100
-@@ -62,7 +62,7 @@
- 	glColor3f(1.0f, 0.0f, 0.0f);

- 	calcWidth();

- 	GLWFont::instance()->getGameFont()->drawSubStr(

--		0, strlen(timeStr) - 1,

-+		0, (int) strlen(timeStr) - 1,

- 		color_, size_,

- 		x_, y_ + 6.0f, 0.0f, timeStr);

- }

-diff -ur scorched_old/src/client/GLW/GLWToolTip.cpp scorched/src/client/GLW/GLWToolTip.cpp
---- scorched_old/src/client/GLW/GLWToolTip.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/GLW/GLWToolTip.cpp	2009-02-23 15:21:53.000000000 +0100
-@@ -128,7 +128,7 @@
- 

- 	tipTextHeight_ = 24.0f;

- 

--	int pos, startpos = 0;

-+	size_t pos, startpos = 0;

- 	LangString tipText = tipText_;

- 	tipText.append(LANG_STRING("\n"));

- 	while ((pos = tipText.find(LANG_STRING("\n"), startpos)) != LangString::npos)

-diff -ur scorched_old/src/client/client/ClientSave.cpp scorched/src/client/client/ClientSave.cpp
---- scorched_old/src/client/client/ClientSave.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/client/ClientSave.cpp	2009-02-23 15:21:55.000000000 +0100
-@@ -100,7 +100,7 @@
- 	FILE *file = fopen(fileName.c_str(), "wb");

- 	if (!file) return false;

- 

--	int size = fwrite(saveBuffer.getBuffer(),	

-+	int size = (int) fwrite(saveBuffer.getBuffer(),	

- 		sizeof(char),

- 		saveBuffer.getBufferUsed(),

- 		file);

-diff -ur scorched_old/src/client/console/ConsoleRules.cpp scorched/src/client/console/ConsoleRules.cpp
---- scorched_old/src/client/console/ConsoleRules.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/console/ConsoleRules.cpp	2009-02-23 15:21:54.000000000 +0100
-@@ -87,7 +87,7 @@
- 

- 			if (values.size() == 1)

- 			{

--				unsigned int nameLen = strlen(rule->getName());

-+				size_t nameLen = strlen(rule->getName());

- 				if (nameLen >= nameValue.valueString.length() &&

- 					_strnicmp(line, rule->getName(), nameValue.valueString.length()) == 0)

- 				{

-diff -ur scorched_old/src/client/dialogs/AdminDialog.cpp scorched/src/client/dialogs/AdminDialog.cpp
---- scorched_old/src/client/dialogs/AdminDialog.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/dialogs/AdminDialog.cpp	2009-02-23 15:21:50.000000000 +0100
-@@ -58,7 +58,7 @@
- 

- 		std::map<unsigned int, Tank *> &tanks = 

- 			ScorchedClient::instance()->getTankContainer().getPlayingTanks();

--		adminTable_->setItemCount(tanks.size());

-+		adminTable_->setItemCount((int) tanks.size());

- 

- 		// Player Actions

- 		GLWPanel *buttonPanel = new GLWPanel(10.0f, 10.0f, 600.0f, 50.0f, false, false);

-@@ -125,7 +125,7 @@
- {

- 	std::map<unsigned int, Tank *> &tanks = 

- 		ScorchedClient::instance()->getTankContainer().getPlayingTanks();

--	adminTable_->setItemCount(tanks.size());

-+	adminTable_->setItemCount((int) tanks.size());

- 

- 	int pos = 0;

- 	std::map<unsigned int, Tank *>::iterator itor;

-@@ -178,7 +178,7 @@
- {

- 	std::map<unsigned int, Tank *> &tanks = 

- 		ScorchedClient::instance()->getTankContainer().getPlayingTanks();

--	adminTable_->setItemCount(tanks.size());

-+	adminTable_->setItemCount((int) tanks.size());

- 

- 	unsigned int sid = ClientAdminResultHandler::instance()->getSid();

- 	unsigned int playerId = 0;

-diff -ur scorched_old/src/client/serverbrowser/ServerBrowserCollect.cpp scorched/src/client/serverbrowser/ServerBrowserCollect.cpp
---- scorched_old/src/client/serverbrowser/ServerBrowserCollect.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/serverbrowser/ServerBrowserCollect.cpp	2009-02-23 15:21:55.000000000 +0100
-@@ -177,7 +177,7 @@
- 

- 		// Find the start of the XML

- 		while (*buffer != '<' && *buffer != '\0') buffer++;

--		unsigned int len = strlen(buffer);

-+		unsigned int len = (unsigned int) strlen(buffer);

- 

- 		// Parse the buffer

- 		if (*buffer == '<')

-diff -ur scorched_old/src/client/serverbrowser/ServerBrowserRefresh.cpp scorched/src/client/serverbrowser/ServerBrowserRefresh.cpp
---- scorched_old/src/client/serverbrowser/ServerBrowserRefresh.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/serverbrowser/ServerBrowserRefresh.cpp	2009-02-23 15:21:55.000000000 +0100
-@@ -72,7 +72,7 @@
- 		time_t theTime = time(0);

- 

- 		// Add a number of new entries

--		for (int i=entryMap_.size(); i<20 && !refreshEntries_.empty(); i++)

-+		for (int i=(int) entryMap_.size(); i<20 && !refreshEntries_.empty(); i++)

- 		{

- 			ServerBrowserRefreshEntry entry = refreshEntries_.front();

- 			refreshEntries_.pop_front();

-diff -ur scorched_old/src/client/sound/Sound.cpp scorched/src/client/sound/Sound.cpp
---- scorched_old/src/client/sound/Sound.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/sound/Sound.cpp	2009-02-23 15:21:53.000000000 +0100
-@@ -406,12 +406,12 @@
- 

- int Sound::getAvailableChannels()

- {

--	return availableSources_.size();

-+	return (int) availableSources_.size();

- }

- 

- int Sound::getPlayingChannels()

- {

--	return playingSources_.size();

-+	return (int) playingSources_.size();

- }

- 

- SoundListener *Sound::getDefaultListener()

-diff -ur scorched_old/src/client/sound/SoundBufferFactory.cpp scorched/src/client/sound/SoundBufferFactory.cpp
---- scorched_old/src/client/sound/SoundBufferFactory.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/sound/SoundBufferFactory.cpp	2009-02-23 15:21:53.000000000 +0100
-@@ -29,7 +29,7 @@
- {

- 	if (Sound::instance()->getInit())

- 	{

--		int len = strlen(fileName);

-+		int len = (int) strlen(fileName);

- 		if (len >= 3)

- 		{

- 			if (0 == strcmp(&fileName[len-3], "wav"))

-diff -ur scorched_old/src/client/tankgraph/RenderTargets.cpp scorched/src/client/tankgraph/RenderTargets.cpp
---- scorched_old/src/client/tankgraph/RenderTargets.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/tankgraph/RenderTargets.cpp	2009-02-23 15:21:50.000000000 +0100
-@@ -215,6 +215,11 @@
- 

- void RenderTargets::draw()

- {

-+	if (!OptionsDisplay::instance()->getNoFog())

-+	{

-+		glEnable(GL_FOG); // NOTE: Fog on

-+	}

-+

- 	// Don't put fully transparent areas into the depth buffer

- 	unsigned int wantedstate = GLState::BLEND_ON | 

- 		GLState::ALPHATEST_ON | GLState::TEXTURE_ON | 

-@@ -244,7 +249,7 @@
- 			itor.init(currentPatch->getTrees());

- 			drawTargets(itor, currentPatch->getDistance());

- 

--			treesDrawn_+=currentPatch->getTrees().size();

-+			treesDrawn_+=(unsigned int) currentPatch->getTrees().size();

- 		}

- 

- 		ModelRendererTree::setSkipPre(false);

-@@ -267,14 +272,14 @@
- 			itor.init(currentPatch->getTargets());

- 			drawTargets(itor, currentPatch->getDistance());

- 

--			targetsDrawn_+=currentPatch->getTargets().size();

-+			targetsDrawn_+=(unsigned int) currentPatch->getTargets().size();

- 		}

- 

- 		{

- 			itor.init(TargetVisibilityPatch::getLargeTargets());

- 			drawTargets(itor, 0.0f);

- 

--			targetsDrawn_+=TargetVisibilityPatch::getLargeTargets().size();

-+			targetsDrawn_+=(unsigned int) TargetVisibilityPatch::getLargeTargets().size();

- 		}

- 	}

- 	GAMESTATE_PERF_COUNTER_END(ScorchedClient::instance()->getGameState(), "TARGETS_DRAW_MODELS");

-@@ -297,6 +302,8 @@
- 			renderImpl->render2D(distance);

- 		}

- 	}

-+

-+	glDisable(GL_FOG); // NOTE: Fog off

- }

- 

- void RenderTargets::draw2d()

-diff -ur scorched_old/src/client/water/WaterWaves.cpp scorched/src/client/water/WaterWaves.cpp
---- scorched_old/src/client/water/WaterWaves.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/client/water/WaterWaves.cpp	2009-02-23 15:21:50.000000000 +0100
-@@ -353,5 +353,5 @@
- 			glVertex3fv(ptD);

- 		}

- 	glEnd();

--	GLInfo::addNoTriangles(paths.size() - 2);

-+	GLInfo::addNoTriangles((unsigned int) paths.size() - 2);

- }

-diff -ur scorched_old/src/common/3dsparse/aseFile.tab.cpp scorched/src/common/3dsparse/aseFile.tab.cpp
---- scorched_old/src/common/3dsparse/aseFile.tab.cpp	2008-03-02 19:47:36.000000000 +0100
-+++ scorched/src/common/3dsparse/aseFile.tab.cpp	2009-02-23 15:21:46.000000000 +0100
-@@ -591,7 +591,7 @@
- #endif

- 

-       /* Get the current used size of the three stacks, in elements.  */

--      int size = yyssp - yyss + 1;

-+      int size = (int)(yyssp - yyss + 1);

- 

- #ifdef yyoverflow

-       /* Each stack pointer address is followed by the size of

-diff -ur scorched_old/src/common/XML/XMLFile.cpp scorched/src/common/XML/XMLFile.cpp
---- scorched_old/src/common/XML/XMLFile.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/XML/XMLFile.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -44,7 +44,7 @@
- 		itor != lines.getLines().end();

- 		itor++)

- 	{

--		if (!parser_.parse((*itor).c_str(), (*itor).size(), 0)) return false;

-+		if (!parser_.parse((*itor).c_str(), (int) (*itor).size(), 0)) return false;

- 

- 		// Hack to get it to count lines correctly :)

- 		if (!parser_.parse("\n", 1, 0)) return false;

-diff -ur scorched_old/src/common/XML/XMLNode.cpp scorched/src/common/XML/XMLNode.cpp
---- scorched_old/src/common/XML/XMLNode.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/XML/XMLNode.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -84,14 +84,14 @@
- 	name_(name), parent_(0), type_(type),

- 	useContentNodes_(false)

- {

--	addContent(content, strlen(content));

-+	addContent(content, (int) strlen(content));

- }

- 

- XMLNode::XMLNode(const char *name, const std::string &content, NodeType type) : 

- 	name_(name), parent_(0), type_(type),

- 	useContentNodes_(false)

- {

--	addContent(content.c_str(), content.size());

-+	addContent(content.c_str(), (int) content.size());

- }

- 

- XMLNode::XMLNode(const char *name, const LangString &langStringContent, NodeType type) : 

-@@ -100,7 +100,7 @@
- {

- 	std::string content;

- 	content = LangStringUtil::convertFromLang(langStringContent);

--	addContent(content.c_str(), content.size());

-+	addContent(content.c_str(), (int) content.size());

- }

- 

- XMLNode::XMLNode(const char *name, float content, NodeType type) :

-@@ -108,7 +108,7 @@
- {

- 	char buffer[20];

- 	snprintf(buffer, 20, "%.2f", content);

--	addContent(buffer, strlen(buffer));

-+	addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::XMLNode(const char *name, int content, NodeType type) :

-@@ -116,7 +116,7 @@
- {

- 	char buffer[20];

- 	snprintf(buffer, 20, "%i", content);

--	addContent(buffer, strlen(buffer));

-+	addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::XMLNode(const char *name, unsigned int content, NodeType type) :

-@@ -124,21 +124,21 @@
- {

- 	char buffer[20];

- 	snprintf(buffer, 20, "%u", content);

--	addContent(buffer, strlen(buffer));

-+	addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::XMLNode(const char *name, bool content, NodeType type) :

- 	name_(name), parent_(0), type_(type), useContentNodes_(false)

- {

- 	const char *buffer = content?"true":"false";

--	addContent(buffer, strlen(buffer));

-+	addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::XMLNode(const char *name, fixed content, NodeType type) :

- 	name_(name), parent_(0), type_(type), useContentNodes_(false)

- {

- 	const char *buffer = content.asString();

--	addContent(buffer, strlen(buffer));

-+	addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::XMLNode(const char *name, FixedVector &content, NodeType type) :

-@@ -152,13 +152,13 @@
- 	addChild(nodeC);

- 

- 	const char *buffer = content[0].asString();

--	nodeA->addContent(buffer, strlen(buffer));

-+	nodeA->addContent(buffer, (int) strlen(buffer));

- 

- 	buffer = content[1].asString();

--	nodeB->addContent(buffer, strlen(buffer));

-+	nodeB->addContent(buffer, (int) strlen(buffer));

- 

- 	buffer = content[2].asString();

--	nodeC->addContent(buffer, strlen(buffer));

-+	nodeC->addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::XMLNode(const char *name, Vector &content, NodeType type) :

-@@ -173,13 +173,13 @@
- 

- 	char buffer[20];

- 	snprintf(buffer, 20, "%.2f", content[0]);

--	nodeA->addContent(buffer, strlen(buffer));

-+	nodeA->addContent(buffer, (int) strlen(buffer));

- 

- 	snprintf(buffer, 20, "%.2f", content[1]);

--	nodeB->addContent(buffer, strlen(buffer));

-+	nodeB->addContent(buffer, (int) strlen(buffer));

- 

- 	snprintf(buffer, 20, "%.2f", content[2]);

--	nodeC->addContent(buffer, strlen(buffer));

-+	nodeC->addContent(buffer, (int) strlen(buffer));

- }

- 

- XMLNode::~XMLNode()

-diff -ur scorched_old/src/common/XML/XMLParser.cpp scorched/src/common/XML/XMLParser.cpp
---- scorched_old/src/common/XML/XMLParser.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/XML/XMLParser.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -100,7 +100,7 @@
- 			atts++;

- 

- 			XMLNode *param = new XMLNode(name, "", XMLNode::XMLParameterType);

--			param->addContent(value, strlen(value));

-+			param->addContent(value, (int) strlen(value));

- 			param->setLine(XML_GetCurrentLineNumber(p_),

- 				XML_GetCurrentColumnNumber(p_));

- 			current_->addParameter(param);

-diff -ur scorched_old/src/common/common/DefinesString.cpp scorched/src/common/common/DefinesString.cpp
---- scorched_old/src/common/common/DefinesString.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/DefinesString.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -27,8 +27,8 @@
- 

- void S3D::trim(std::string &value)

- {

--	int start = value.find_first_not_of(" \t\n");

--	int end = value.find_last_not_of(" \t\n");

-+	size_t start = value.find_first_not_of(" \t\n");

-+	size_t end = value.find_last_not_of(" \t\n");

- 	if (start == std::string::npos) value = "";

- 	else if (end == std::string::npos) value = "";

- 	else value = std::string(value, start, end-start+1);

-diff -ur scorched_old/src/common/common/FileLogger.cpp scorched/src/common/common/FileLogger.cpp
---- scorched_old/src/common/common/FileLogger.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/FileLogger.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -39,7 +39,7 @@
- 	if (!logFile_) return;

- 

- 	// Log to file and flush file

--	size_ += strlen(info.getMessage());

-+	size_ += (unsigned int) strlen(info.getMessage());

- 	fprintf(logFile_, "%s - %s\n", info.getTime(), info.getMessage());

- 	fflush(logFile_);

- }

-diff -ur scorched_old/src/common/common/NumberParser.cpp scorched/src/common/common/NumberParser.cpp
---- scorched_old/src/common/common/NumberParser.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/NumberParser.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -53,10 +53,9 @@
- bool NumberParser::getOperands()

- {

- 	operands_.clear();

--        int count = 0;

--	int nextPos = 0;

-+	size_t nextPos = 0;

-         std::string value;

--        int pos = (int) expression_.find('(',0);

-+        size_t pos = expression_.find('(',0);

- 	if (pos == std::string::npos)

- 	{

- 		//value = expression_.substr(pos + 1, nextPos - pos + 1);

-@@ -65,11 +64,11 @@
- 	}

- 

- 	pos += 1;

--        while (pos < (int) expression_.length())

-+        while (pos < expression_.length())

-         {

--                nextPos = (int) expression_.find_first_of(",)", pos);

-+                nextPos = expression_.find_first_of(",)", pos);

-                 if (nextPos == std::string::npos)

--                        nextPos = (int) expression_.length() -1;

-+                        nextPos = expression_.length() -1;

-                 value = expression_.substr(pos, nextPos - pos);

-                 operands_.push_back(fixed(value.c_str()));

-                 pos = nextPos + 1;

-diff -ur scorched_old/src/common/common/RandomGenerator.cpp scorched/src/common/common/RandomGenerator.cpp
---- scorched_old/src/common/common/RandomGenerator.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/RandomGenerator.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -42,7 +42,7 @@
- 		DIALOG_ASSERT(in);

- 		bufferSize_= 100000;

- 		unsigned int *tmpbuffer = new unsigned int[bufferSize_];

--		int size = fread(tmpbuffer, sizeof(unsigned int), bufferSize_, in);

-+		int size = (int) fread(tmpbuffer, sizeof(unsigned int), bufferSize_, in);

- 		fclose(in);	

- 		DIALOG_ASSERT(size == bufferSize_);

- 

-diff -ur scorched_old/src/common/common/SplinePath.cpp scorched/src/common/common/SplinePath.cpp
---- scorched_old/src/common/common/SplinePath.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/SplinePath.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -57,7 +57,7 @@
- {

- 	fixed currentPointTime = pathTime_ * pointsPerSecond_;

- 

--	unsigned int noPoints = pathPoints_.size();

-+	unsigned int noPoints = (unsigned int) pathPoints_.size();

- 	unsigned int currentPointId = (unsigned int) (currentPointTime).asInt();

- 	fixed currentPointDiff = currentPointTime - fixed(currentPointId);

- 	currentPointId = currentPointId % noPoints;

-diff -ur scorched_old/src/common/common/StatsLoggerDatabase.cpp scorched/src/common/common/StatsLoggerDatabase.cpp
---- scorched_old/src/common/common/StatsLoggerDatabase.cpp	2009-01-11 15:46:55.000000000 +0100
-+++ scorched/src/common/common/StatsLoggerDatabase.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -882,7 +882,7 @@
- 	char playerName[1024];

- 	escapeString(playerName, 

- 		tank->getCStrName().c_str(),

--		tank->getCStrName().size());

-+		(unsigned long) tank->getCStrName().size());

- 

- 	// Add the players name (may fail if duplicates)

- 	runQuery("INSERT INTO scorched3d_names (playerid, name, count) VALUES "

-diff -ur scorched_old/src/common/common/Vector.h scorched/src/common/common/Vector.h
---- scorched_old/src/common/common/Vector.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/common/Vector.h	2009-02-23 15:21:47.000000000 +0100
-@@ -77,18 +77,16 @@
- 	Vector Normalize()

- 	{

- 		float mag = Magnitude();

--		Vector v;

- 		if (mag == 0.0f) mag = 0.00001f;

--		v = (*this) / mag;

-+		Vector v(V[0] / mag, V[1] / mag, V[2] / mag);

- 		return v;

- 	}

- 

- 	Vector Normalize2D()

- 	{

--		float mag = float(sqrt(V[0]*V[0] + V[1]*V[1]));

--		Vector v;

-+		float mag = Magnitude2d();

- 		if (mag == 0.0f) mag = 0.00001f;

--		v = (*this) / mag;

-+		Vector v(V[0] / mag, V[1] / mag, V[2] / mag);

- 		return v;

- 	}

- 

-@@ -114,9 +112,8 @@
- 

- 	float dotP(const Vector &Vin)

- 	{

--		Vector &V1 = (*this);

- 		Vector &V2 = (Vector &) Vin;

--		return (V1.V[0] * V2.V[0]) + (V1.V[1] * V2.V[1]) + (V1.V[2] * V2.V[2]);

-+		return (V[0] * V2.V[0]) + (V[1] * V2.V[1]) + (V[2] * V2.V[2]);

- 	}

- 

- 	float Max()

-@@ -141,7 +138,9 @@
- 	{

- 		float mag = Magnitude();

- 		if (mag == 0.0f) mag = 0.00001f;

--		(*this) /= mag;

-+		V[0] /= mag;

-+		V[1] /= mag;

-+		V[2] /= mag;

- 	}

- 

- 	void zero()

-@@ -271,7 +270,9 @@
- 

- 	void operator-=(const float a)

- 	{

--		(*this) += -a;

-+		V[0] -= a;

-+		V[1] -= a;

-+		V[2] -= a;

- 	}

- 

- 	void operator-=(const Vector &Vin)

-@@ -288,7 +289,7 @@
- 

- 	bool operator!=(const Vector &Vin1)

- 	{

--		return !((*this) == Vin1);

-+		return (Vin1.V[0]!=V[0] || Vin1.V[1]!=V[1] || Vin1.V[2]!=V[2]);

- 	}

- 

- 	float &operator[](const int m) { DIALOG_ASSERT(m<=2); return V[m]; }

-diff -ur scorched_old/src/common/common/fixed.cpp scorched/src/common/common/fixed.cpp
---- scorched_old/src/common/common/fixed.cpp	2008-03-02 19:47:36.000000000 +0100
-+++ scorched/src/common/common/fixed.cpp	2009-02-23 15:21:47.000000000 +0100
-@@ -132,7 +132,7 @@
- 	{

- 		snprintf(buffer, 15, "%i", m_nVal);

- 	}

--	int len = strlen(buffer);

-+	int len = (int) strlen(buffer);

- 

- 	if (len <= 4)

- 	{

-diff -ur scorched_old/src/common/engine/ModFileEntry.cpp scorched/src/common/engine/ModFileEntry.cpp
---- scorched_old/src/common/engine/ModFileEntry.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/engine/ModFileEntry.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -134,7 +134,7 @@
- 		tmpBuffer.reset();

- 		do

- 		{

--			newSize = fread(buffer, 

-+			newSize = (int) fread(buffer, 

- 				sizeof(unsigned char), 

- 				sizeof(buffer), 

- 				file);

-diff -ur scorched_old/src/common/engine/ModFiles.cpp scorched/src/common/engine/ModFiles.cpp
---- scorched_old/src/common/engine/ModFiles.cpp	2009-01-11 16:30:44.000000000 +0100
-+++ scorched/src/common/engine/ModFiles.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -43,8 +43,8 @@
- 

- bool ModFiles::fileEnding(const std::string &file, const std::string &ext)

- {

--	int fileLen = file.size();

--	int extLen = ext.size();

-+	int fileLen = (int) file.size();

-+	int extLen = (int) ext.size();

- 	if (fileLen < extLen) return false;

- 

- 	for (int i=0; i<extLen; i++)

-@@ -211,7 +211,7 @@
- 

- 	// Turn it into a unix style path and remove the 

- 	// name of the directory that contains it

--	int modDirLen = modDir.size();

-+	int modDirLen = (int) modDir.size();

- 	shortFileName += modDirLen;

- 	while (shortFileName[0] == '/') shortFileName++;

- 

-@@ -337,7 +337,7 @@
- 	// Read Buffer

- 	NetBuffer tmpBuffer;

- 	unsigned char readBuf[512];

--	while (unsigned int size = fread(readBuf, sizeof(unsigned char), 512, in))

-+	while (unsigned int size = (unsigned int) fread(readBuf, sizeof(unsigned char), 512, in))

- 	{

- 		tmpBuffer.addDataToBuffer(readBuf, size);

- 	}

-diff -ur scorched_old/src/common/image/ImageJpg.cpp scorched/src/common/image/ImageJpg.cpp
---- scorched_old/src/common/image/ImageJpg.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/image/ImageJpg.cpp	2009-02-23 15:21:45.000000000 +0100
-@@ -120,7 +120,7 @@
- 	int read = 0;

- 	char buffer[256];

- 	NetBuffer netBuffer;

--	while (read = fread(buffer, 1, 256, file))

-+	while (read = (int) fread(buffer, 1, 256, file))

- 	{

- 		netBuffer.addDataToBuffer(buffer, read);

- 	}

-diff -ur scorched_old/src/common/image/ImagePng.cpp scorched/src/common/image/ImagePng.cpp
---- scorched_old/src/common/image/ImagePng.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/image/ImagePng.cpp	2009-02-23 15:21:45.000000000 +0100
-@@ -125,7 +125,7 @@
- 	int read = 0;

- 	char buffer[256];

- 	NetBuffer netBuffer;

--	while (read = fread(buffer, 1, 256, file))

-+	while (read = (int) fread(buffer, 1, 256, file))

- 	{

- 		netBuffer.addDataToBuffer(buffer, read);

- 	}

-diff -ur scorched_old/src/common/lang/LangParam.cpp scorched/src/common/lang/LangParam.cpp
---- scorched_old/src/common/lang/LangParam.cpp	2009-02-23 19:10:57.000000000 +0100
-+++ scorched/src/common/lang/LangParam.cpp	2009-02-23 15:21:43.000000000 +0100
-@@ -26,18 +26,18 @@
- {

- 	const LangString &value = convValue.getValue();

- 

--	int valueLen = value.size();

--	int current = 0;

-+	size_t valueLen = value.size();

-+	size_t current = 0;

- 	while (current < valueLen)

- 	{

--		int bstart = value.find('{', current);

-+		size_t bstart = value.find('{', current);

- 		if (bstart == std::string::npos) 

- 		{

- 			parts_.push_back(LangString(value, current));

- 			break;

- 		}

- 

--		int bend = value.find('}', bstart);

-+		size_t bend = value.find('}', bstart);

- 		if (bend == std::string::npos)

- 		{

- 			parts_.push_back(LangString(value, current));

-@@ -45,7 +45,7 @@
- 		}

- 

- 		static LangString numbers = LANG_STRING("0123456789");

--		int charstart = value.find_first_not_of(numbers, bstart+1);

-+		size_t charstart = value.find_first_not_of(numbers, bstart+1);

- 		if (charstart != bend)

- 		{

- 			parts_.push_back(LangString(value, current));

-diff -ur scorched_old/src/common/lang/LangString.cpp scorched/src/common/lang/LangString.cpp
---- scorched_old/src/common/lang/LangString.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/lang/LangString.cpp	2009-02-23 15:21:43.000000000 +0100
-@@ -187,7 +187,8 @@
- 

- unsigned int *LangStringUtil::strstr(const unsigned int *str1, const LangString &str2)

- {

--	unsigned int pos = LangString(str1).find(str2);

-+	LangString newString(str1);

-+	size_t pos = newString.find(str2);

- 	if (pos == LangString::npos) return 0;

- 	return (unsigned int*)(str1 + pos);

- }

-@@ -198,15 +199,15 @@
- 	LangString str2l(str2);

- 	lowercase(str1l);

- 	lowercase(str2l);

--	unsigned int pos = str1l.find(str2l);

-+	size_t pos = str1l.find(str2l);

- 	if (pos == LangString::npos) return 0;

- 	return (unsigned int*)(str1 + pos);

- }

- 

- void LangStringUtil::trim(LangString &value)

- {

--	int start = value.find_first_not_of(LANG_STRING(" \t\n"));

--	int end = value.find_last_not_of(LANG_STRING(" \t\n"));

-+	size_t start = value.find_first_not_of(LANG_STRING(" \t\n"));

-+	size_t end = value.find_last_not_of(LANG_STRING(" \t\n"));

- 	if (start == LangString::npos) value.clear();

- 	else if (end == LangString::npos) value.clear();

- 	else value = LangString(value, start, end-start+1);

-diff -ur scorched_old/src/common/tank/TankAvatar.cpp scorched/src/common/tank/TankAvatar.cpp
---- scorched_old/src/common/tank/TankAvatar.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/tank/TankAvatar.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -89,7 +89,7 @@
- 		name_ = fileName;

- 		file_->reset();

- 		unsigned char readBuf[512];

--		while (unsigned int size = fread(readBuf, sizeof(unsigned char), 512, in))

-+		while (unsigned int size = (unsigned int) fread(readBuf, sizeof(unsigned char), 512, in))

- 		{

- 			file_->addDataToBuffer(readBuf, size);

- 		}

-diff -ur scorched_old/src/common/tank/TankPosition.cpp scorched/src/common/tank/TankPosition.cpp
---- scorched_old/src/common/tank/TankPosition.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/tank/TankPosition.cpp	2009-02-23 15:21:48.000000000 +0100
-@@ -107,7 +107,7 @@
- {

- 	if (index < oldShots_.size())

- 	{

--		int newIndex = (oldShots_.size() - 1) - index;

-+		int newIndex = (int) (oldShots_.size() - 1) - index;

- 		rotateGunXY(oldShots_[newIndex].rot, false);

- 		rotateGunYZ(oldShots_[newIndex].ele, false);

- 		changePower(oldShots_[newIndex].power, false);

-diff -ur scorched_old/src/common/target/Target.h scorched/src/common/target/Target.h
---- scorched_old/src/common/target/Target.h	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/target/Target.h	2009-02-23 15:21:46.000000000 +0100
-@@ -83,7 +83,7 @@
- 	const LangString &getTargetName() { return name_; }

- 	const std::string &getCStrName();

- 	void setName(const LangString &name);

--	unsigned int getNameLen() { return name_.size(); }

-+	unsigned int getNameLen() { return (unsigned int) name_.size(); }

- 

- 	// Serialize the target

- 	virtual bool writeMessage(NetBuffer &buffer);

-diff -ur scorched_old/src/common/weapons/AccessoryStore.cpp scorched/src/common/weapons/AccessoryStore.cpp
---- scorched_old/src/common/weapons/AccessoryStore.cpp	2009-01-21 14:02:58.000000000 +0100
-+++ scorched/src/common/weapons/AccessoryStore.cpp	2009-02-23 15:21:49.000000000 +0100
-@@ -65,7 +65,7 @@
- 	}

- 

- 	// Itterate all of the accessories in the file

--	int noChildren = file.getRootNode()->getChildren().size();

-+	int noChildren = (int) file.getRootNode()->getChildren().size();

- 	int childCount = 0;

- 	XMLNode *currentNode = 0;

- 	while (file.getRootNode()->getNamedChild("accessory", currentNode, false))

-diff -ur scorched_old/src/common/weapons/EconomyFreeMarket.cpp scorched/src/common/weapons/EconomyFreeMarket.cpp
---- scorched_old/src/common/weapons/EconomyFreeMarket.cpp	2008-12-29 18:38:23.000000000 +0100
-+++ scorched/src/common/weapons/EconomyFreeMarket.cpp	2009-02-23 15:21:49.000000000 +0100
-@@ -200,7 +200,7 @@
- 	if (possibleAccessories.size() <= 1) return;

- 

- 	// How much should each accessory get (on average)

--	int moneyShouldAquire = boughtAccessory->getPrice() / possibleAccessories.size();

-+	int moneyShouldAquire = boughtAccessory->getPrice() / (int) possibleAccessories.size();

- 	

- 	// Alter prices

- 	{

-diff -ur scorched_old/src/server/webserver/ServerWebServerUtil.cpp scorched/src/server/webserver/ServerWebServerUtil.cpp
---- scorched_old/src/server/webserver/ServerWebServerUtil.cpp	2008-12-28 20:33:43.000000000 +0100
-+++ scorched/src/server/webserver/ServerWebServerUtil.cpp	2009-02-23 15:21:41.000000000 +0100
-@@ -401,15 +401,16 @@
- 	while (true)

- 	{

- 		// Find start {{permission}}

--		int start1 = result.find("{{");

-+		size_t start1 = result.find("{{");

- 		if (start1 == std::string::npos) break;

--		int end1 = result.find("}}", start1);

-+		size_t end1 = result.find("}}", start1);

- 		if (end1 == std::string::npos) break;

- 		std::string perm(result, start1 + 2, end1 - start1 - 2);

- 		result.replace(start1, end1 - start1 + 2, "");

- 

- 		// Find end {{permission}}

--		int start2 = result.find(S3D::formatStringBuffer("{{%s}}", perm.c_str()), start1);

-+		size_t start2 = result.find(

-+			S3D::formatStringBuffer("{{%s}}", perm.c_str()), start1);

- 		if (start2 == std::string::npos) break;

- 		result.replace(start2, 4 + perm.size(), "");

- 

diff --git a/games-strategy/scorched3d/files/scorched3d-42-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-42-gcc43.patch
deleted file mode 100644
index 6497e3cf5419..000000000000
--- a/games-strategy/scorched3d/files/scorched3d-42-gcc43.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -ur scorched.old/src/client/console/ConsoleImpl.cpp scorched/src/client/console/ConsoleImpl.cpp
---- scorched.old/src/client/console/ConsoleImpl.cpp	2009-02-18 20:06:23.000000000 +0200
-+++ scorched/src/client/console/ConsoleImpl.cpp	2009-02-18 20:39:23.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <GLEXT/GLViewPort.h>

- #include <GLW/GLWFont.h>

- #include <GLW/GLWToolTip.h>

-+#include <climits>

- 

- ConsoleImpl::ConsoleImpl() : 

- 	GameStateI("Console"),

-diff -ur scorched.old/src/common/common/DefinesFile.cpp scorched/src/common/common/DefinesFile.cpp
---- scorched.old/src/common/common/DefinesFile.cpp	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/common/DefinesFile.cpp	2009-02-18 20:07:58.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <common/DefinesFile.h>

- #include <sys/types.h>

- #include <sys/stat.h>

-+#include <cstring>

- 

- #pragma warning(disable : 4996)

- 

-diff -ur scorched.old/src/common/common/LoggerI.cpp scorched/src/common/common/LoggerI.cpp
---- scorched.old/src/common/common/LoggerI.cpp	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/common/LoggerI.cpp	2009-02-18 20:14:55.000000000 +0200
-@@ -20,6 +20,7 @@
- 

- #include <common/LoggerI.h>

- #include <time.h>

-+#include <cstring>

- 

- LoggerInfo::LoggerInfo(

- 	const std::string &message, 

-diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
---- scorched.old/src/common/common/main.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/common/main.h	2009-02-18 20:07:18.000000000 +0200
-@@ -40,7 +40,7 @@
- void _no_storage()

- {

- 	printf("Failed to allocate memory!!");

--	std::exit(1);

-+	exit(1);

- }

- 

- void run_main(int argc, char *argv[], OptionsParameters &params)

-diff -ur scorched.old/src/common/common/sha2.h scorched/src/common/common/sha2.h
---- scorched.old/src/common/common/sha2.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/common/sha2.h	2009-02-18 20:24:57.000000000 +0200
-@@ -46,6 +46,7 @@
- 

- #include <string>

- #include <stdexcept>

-+#include <cstring>

- 

- // NOTE: You may need to define things by hand for your system: 

- typedef unsigned char  sha_byte;           // Exactly 1 byte 

-diff -ur scorched.old/src/common/landscapemap/HeightMapModifier.cpp scorched/src/common/landscapemap/HeightMapModifier.cpp
---- scorched.old/src/common/landscapemap/HeightMapModifier.cpp	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/landscapemap/HeightMapModifier.cpp	2009-02-18 20:28:50.000000000 +0200
-@@ -26,6 +26,7 @@
- #include <image/ImageBitmap.h>

- #include <image/ImageFactory.h>

- #include <lang/LangResource.h>

-+#include <climits>

- 

- void HeightMapModifier::levelSurround(HeightMap &hmap)

- {

-diff -ur scorched.old/src/common/lang/LangParam.cpp scorched/src/common/lang/LangParam.cpp
---- scorched.old/src/common/lang/LangParam.cpp	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/lang/LangParam.cpp	2009-02-18 20:22:06.000000000 +0200
-@@ -20,6 +20,7 @@
- 

- #include <lang/LangParam.h>

- #include <common/DefinesString.h>

-+#include <cstdlib>

- 

- LangParam::LangParam(const LangStringConverter &convValue)

- {

-diff -ur scorched.old/src/common/lang/ResourceBundle.h scorched/src/common/lang/ResourceBundle.h
---- scorched.old/src/common/lang/ResourceBundle.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/lang/ResourceBundle.h	2009-02-18 20:20:12.000000000 +0200
-@@ -23,6 +23,7 @@
- 

- #include <set>

- #include <lang/ResourceBundleEntry.h>

-+#include <cstring>

- 

- class ResourceBundle

- {

-diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
---- scorched.old/src/common/porting/windows.h	2009-02-18 20:06:22.000000000 +0200
-+++ scorched/src/common/porting/windows.h	2009-02-18 20:06:46.000000000 +0200
-@@ -20,7 +20,7 @@
- typedef unsigned short  WORD;

- typedef unsigned char   BYTE;

- 

--typedef int 	HWND;

-+// typedef int 	HWND;

- typedef void * 	HINSTANCE;

- typedef int 	WPARAM;

- typedef int 	LPARAM;

diff --git a/games-strategy/scorched3d/files/scorched3d-42-fixups.patch b/games-strategy/scorched3d/files/scorched3d-42.1-fixups.patch
index 36a027cb60cc..36a027cb60cc 100644
--- a/games-strategy/scorched3d/files/scorched3d-42-fixups.patch
+++ b/games-strategy/scorched3d/files/scorched3d-42.1-fixups.patch
diff --git a/games-strategy/scorched3d/files/scorched3d-42.1-gcc43.patch b/games-strategy/scorched3d/files/scorched3d-42.1-gcc43.patch
new file mode 100644
index 000000000000..b235f07c585f
--- /dev/null
+++ b/games-strategy/scorched3d/files/scorched3d-42.1-gcc43.patch
@@ -0,0 +1,24 @@
+diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h
+--- scorched.old/src/common/common/main.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/common/main.h	2009-02-18 20:07:18.000000000 +0200
+@@ -40,7 +40,7 @@
+ void _no_storage()

+ {

+ 	printf("Failed to allocate memory!!");

+-	std::exit(1);

++	exit(1);

+ }

+ 

+ void run_main(int argc, char *argv[], OptionsParameters &params)

+diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h
+--- scorched.old/src/common/porting/windows.h	2009-02-18 20:06:22.000000000 +0200
++++ scorched/src/common/porting/windows.h	2009-02-18 20:06:46.000000000 +0200
+@@ -20,7 +20,7 @@
+ typedef unsigned short  WORD;

+ typedef unsigned char   BYTE;

+ 

+-typedef int 	HWND;

++// typedef int 	HWND;

+ typedef void * 	HINSTANCE;

+ typedef int 	WPARAM;

+ typedef int 	LPARAM;

diff --git a/games-strategy/scorched3d/scorched3d-42.ebuild b/games-strategy/scorched3d/scorched3d-42.1.ebuild
index 20434fcc5d31..538621be071b 100644
--- a/games-strategy/scorched3d/scorched3d-42.ebuild
+++ b/games-strategy/scorched3d/scorched3d-42.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.ebuild,v 1.3 2009/02/23 22:57:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/scorched3d/scorched3d-42.1.ebuild,v 1.1 2009/03/03 17:59:07 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils wxwidgets games
 
 DESCRIPTION="Multi-player tank battle in 3D (OpenGL)"
 HOMEPAGE="http://www.scorched3d.co.uk/"
-SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz -> Scorched3D-${PV}-src.tar"
+SRC_URI="mirror://sourceforge/${PN}/Scorched3D-${PV}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,8 +37,7 @@ S=${WORKDIR}/scorched
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-fixups.patch \
-		"${FILESDIR}"/${P}-gcc43.patch \
-		"${FILESDIR}"/${P}-amd64.patch
+		"${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }