13 files changed, 12 insertions, 588 deletions

diff --git a/games-action/maelstrom/ChangeLog b/games-action/maelstrom/ChangeLog
index d26dfd8881ef..d481654458bb 100644
--- a/games-action/maelstrom/ChangeLog
+++ b/games-action/maelstrom/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-action/maelstrom
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/ChangeLog,v 1.14 2004/12/28 22:52:18 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/ChangeLog,v 1.15 2005/08/09 21:25:05 mr_bones_ Exp $
+
+  09 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -files/maelstrom-3.0.6-security.patch, -maelstrom-3.0.5.ebuild,
+  -maelstrom-3.0.6.ebuild:
+  clean old versions
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-action/maelstrom/files/digest-maelstrom-3.0.5 b/games-action/maelstrom/files/digest-maelstrom-3.0.5
deleted file mode 100644
index 3f32930a0a61..000000000000
--- a/games-action/maelstrom/files/digest-maelstrom-3.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ceb9689e652c058b9d215531d7de7d4a Maelstrom-3.0.5.tar.gz 977191
diff --git a/games-action/maelstrom/files/digest-maelstrom-3.0.6 b/games-action/maelstrom/files/digest-maelstrom-3.0.6
deleted file mode 100644
index 1fbf791cebf6..000000000000
--- a/games-action/maelstrom/files/digest-maelstrom-3.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8aab0e75ca52808fd6777535ebb1f1c4 Maelstrom-3.0.6.tar.gz 1007421
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-security.patch b/games-action/maelstrom/files/maelstrom-3.0.6-security.patch
deleted file mode 100644
index ae22c0cdd11a..000000000000
--- a/games-action/maelstrom/files/maelstrom-3.0.6-security.patch
+++ /dev/null
@@ -1,380 +0,0 @@
-diff -ur Maelstrom-3.0.6-orig/controls.cpp Maelstrom-3.0.6/controls.cpp
---- Maelstrom-3.0.6-orig/controls.cpp	2001-03-25 03:04:28 +0900
-+++ Maelstrom-3.0.6/controls.cpp	2003-05-21 11:25:53 +0900
-@@ -83,7 +83,7 @@
- 	if ( fname ) {
- 		*fname = datafile;
- 	}
--	sprintf(datafile,  "%s"DIR_SEP"%s", home, MAELSTROM_DATA);
-+	snprintf(datafile, sizeof(datafile), "%s"DIR_SEP"%s", home, MAELSTROM_DATA);
- 	if ( (data=fopen(datafile, mode)) == NULL )
- 		return(NULL);
- 	return(data);
-diff -ur Maelstrom-3.0.6-orig/dialog.h Maelstrom-3.0.6/dialog.h
---- Maelstrom-3.0.6-orig/dialog.h	2001-07-21 00:08:10 +0900
-+++ Maelstrom-3.0.6/dialog.h	2003-05-21 11:24:33 +0900
-@@ -92,7 +92,7 @@
- 		va_list ap;
- 
- 		va_start(ap, fmt);
--		vsprintf(errbuf, fmt, ap);
-+		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
- 		va_end(ap);
- 		errstr = errbuf;
-         }
-@@ -878,7 +878,7 @@
- 		if ( entry->text ) {
- 			Fontserv->FreeText(entry->text);
- 		}
--		sprintf(buf, "%d", *entry->variable);
-+		snprintf(buf, sizeof(buf), "%d", *entry->variable);
- 
- 		if ( entry->hilite ) {
- 			clear = Fg;
-diff -ur Maelstrom-3.0.6-orig/load.cpp Maelstrom-3.0.6/load.cpp
---- Maelstrom-3.0.6-orig/load.cpp	2000-02-15 11:47:39 +0900
-+++ Maelstrom-3.0.6/load.cpp	2003-05-21 11:26:18 +0900
-@@ -81,7 +81,7 @@
- 	SDL_Surface *bmp, *title;
- 	
- 	/* Open the title file -- we know its colormap is our global one */
--	sprintf(file, "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
-+	snprintf(file, sizeof(file), "Images"DIR_SEP"Maelstrom_Titles#%d.bmp", title_id);
- 	bmp = SDL_LoadBMP(path.Path(file));
- 	if ( bmp == NULL ) {
- 		return(NULL);
-@@ -103,7 +103,7 @@
- 	Uint16 w, h;
- 	
- 	/* Open the cicn sprite file.. */
--	sprintf(file, "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
-+	snprintf(file, sizeof(file), "Images"DIR_SEP"Maelstrom_Icon#%hd.cicn", cicn_id);
- 	if ( (cicn_src=SDL_RWFromFile(path.Path(file), "r")) == NULL ) {
- 		error("GetCIcon(%hd): Can't open CICN %s: ",
- 					cicn_id, path.Path(file));
-diff -ur Maelstrom-3.0.6-orig/maclib/Mac_FontServ.h Maelstrom-3.0.6/maclib/Mac_FontServ.h
---- Maelstrom-3.0.6-orig/maclib/Mac_FontServ.h	1999-12-03 02:15:33 +0900
-+++ Maelstrom-3.0.6/maclib/Mac_FontServ.h	2003-05-21 11:28:43 +0900
-@@ -135,7 +135,7 @@
- 		va_list ap;
- 
- 		va_start(ap, fmt);
--		vsprintf(errbuf, fmt, ap);
-+		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
- 		va_end(ap);
- 		errstr = errbuf;
- 	}
-diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Resource.h Maelstrom-3.0.6/maclib/Mac_Resource.h
---- Maelstrom-3.0.6-orig/maclib/Mac_Resource.h	1999-12-04 03:01:47 +0900
-+++ Maelstrom-3.0.6/maclib/Mac_Resource.h	2003-05-21 11:28:35 +0900
-@@ -96,7 +96,7 @@
- 		va_list ap;
- 
- 		va_start(ap, fmt);
--		vsprintf(errbuf, fmt, ap);
-+		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
- 		va_end(ap);
- 		errstr = errbuf;
- 	}
-diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Sound.h Maelstrom-3.0.6/maclib/Mac_Sound.h
---- Maelstrom-3.0.6-orig/maclib/Mac_Sound.h	2002-10-20 11:53:34 +0900
-+++ Maelstrom-3.0.6/maclib/Mac_Sound.h	2003-05-21 11:28:27 +0900
-@@ -199,7 +199,7 @@
- 		va_list ap;
- 
- 		va_start(ap, fmt);
--		vsprintf(errbuf, fmt, ap);
-+		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
- 		va_end(ap);
- 		errstr = errbuf;
- 	}
-diff -ur Maelstrom-3.0.6-orig/maclib/Mac_Wave.h Maelstrom-3.0.6/maclib/Mac_Wave.h
---- Maelstrom-3.0.6-orig/maclib/Mac_Wave.h	2000-01-26 01:44:10 +0900
-+++ Maelstrom-3.0.6/maclib/Mac_Wave.h	2003-05-21 11:28:20 +0900
-@@ -108,7 +108,7 @@
- 		va_list ap;
- 
- 		va_start(ap, fmt);
--		vsprintf(errbuf, fmt, ap);
-+		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
- 		va_end(ap);
- 		errstr = errbuf;
- 	}
-diff -ur Maelstrom-3.0.6-orig/maclib/macres.cpp Maelstrom-3.0.6/maclib/macres.cpp
---- Maelstrom-3.0.6-orig/maclib/macres.cpp	2000-01-26 01:44:20 +0900
-+++ Maelstrom-3.0.6/maclib/macres.cpp	2003-05-21 11:30:01 +0900
-@@ -58,8 +58,8 @@
- 				ids[j], res->ResourceName(types[i], ids[j]));
- 			if ( argv[2] ) {
- 				char path[23];
--				sprintf(path,"%s/%s:%hu", argv[2],
--							types[i], ids[j]);
-+				snprintf(path, sizeof(path), "%s/%s:%hu",
-+					 argv[2], types[i], ids[j]);
- 				FILE *output;
- 				Mac_ResData *D;
-             			if ( (output=fopen(path, "w")) != NULL ) {
-diff -ur Maelstrom-3.0.6-orig/maclib/snd2wav.cpp Maelstrom-3.0.6/maclib/snd2wav.cpp
---- Maelstrom-3.0.6-orig/maclib/snd2wav.cpp	2001-03-28 12:54:50 +0900
-+++ Maelstrom-3.0.6/maclib/snd2wav.cpp	2003-05-21 11:29:23 +0900
-@@ -82,7 +82,7 @@
- 			continue;
- 		}
- 		wave.Load(snd, rate);
--		sprintf(wavname, "snd_%d.wav", ids[i]);
-+		snprintf(wavname, sizeof(wavname), "snd_%d.wav", ids[i]);
- 		wave.Save(wavname);
- 	}
- 	delete macx;
-diff -ur Maelstrom-3.0.6-orig/main.cpp Maelstrom-3.0.6/main.cpp
---- Maelstrom-3.0.6-orig/main.cpp	2002-10-20 11:53:32 +0900
-+++ Maelstrom-3.0.6/main.cpp	2003-05-21 11:27:02 +0900
-@@ -445,7 +445,7 @@
- 		DrawText(xOff+309-7, yOff+240-6, text, geneva, STYLE_BOLD,
- 							0x00, 0x00, 0x00);
- 	}
--	sprintf(text, "%d", gSoundLevel);
-+	snprintf(text, sizeof(text), "%d", gSoundLevel);
- 	DrawText(xOff+309-7, yOff+240-6, text, geneva, STYLE_BOLD,
- 						30000>>8, 30000>>8, 0xFF);
- 	screen->Update();
-@@ -547,11 +547,11 @@
- 		}
- 		DrawText(xOff+5, botDiv+42+(index*18), hScores[index].name,
- 						font, STYLE_BOLD, R, G, B);
--		sprintf(buffer, "%u", hScores[index].score);
-+		snprintf(buffer, sizeof(buffer), "%u", hScores[index].score);
- 		sw = fontserv->TextWidth(buffer, font, STYLE_BOLD);
- 		DrawText(sRt-sw, botDiv+42+(index*18), buffer, 
- 						font, STYLE_BOLD, R, G, B);
--		sprintf(buffer, "%u", hScores[index].wave);
-+		snprintf(buffer, sizeof(buffer), "%u", hScores[index].wave);
- 		sw = fontserv->TextWidth(buffer, font, STYLE_BOLD);
- 		DrawText(wRt-sw, botDiv+42+(index*18), buffer, 
- 						font, STYLE_BOLD, R, G, B);
-@@ -560,7 +560,7 @@
- 
- 	DrawText(xOff+5, botDiv+46+(10*18)+3, "Last Score: ", 
- 					bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF);
--	sprintf(buffer, "%d", GetScore());
-+	snprintf(buffer, sizeof(buffer), "%d", GetScore());
- 	sw = fontserv->TextWidth("Last Score: ", bigfont, STYLE_NORM);
- 	DrawText(xOff+5+sw, botDiv+46+(index*18)+3, buffer, 
- 					bigfont, STYLE_NORM, 0xFF, 0xFF, 0xFF);
-diff -ur Maelstrom-3.0.6-orig/myerror.cpp Maelstrom-3.0.6/myerror.cpp
---- Maelstrom-3.0.6-orig/myerror.cpp	1998-07-14 10:50:17 +0900
-+++ Maelstrom-3.0.6/myerror.cpp	2003-05-21 11:23:33 +0900
-@@ -16,7 +16,7 @@
- 	va_list ap;
- 
- 	va_start(ap, fmt);
--	vsprintf(mesg, fmt, ap);
-+	vsnprintf(mesg, sizeof(mesg), fmt, ap);
- 	fputs(mesg, stderr);
- 	va_end(ap);
- }
-@@ -27,7 +27,7 @@
- 	va_list ap;
- 
- 	va_start(ap, fmt);
--	vsprintf(mesg, fmt, ap);
-+	vsnprintf(mesg, sizeof(mesg), fmt, ap);
- 	fputs(mesg, stdout);
- 	va_end(ap);
- }
-@@ -37,7 +37,7 @@
- 	char buffer[BUFSIZ];
- 
- 	if ( *msg ) {
--		sprintf(buffer, "%s: %s\n", msg, strerror(errno));
-+		snprintf(buffer, sizeof(buffer), "%s: %s\n", msg, strerror(errno));
- 		error(buffer);
- 	} else
- 		error((char *)strerror(errno));
-diff -ur Maelstrom-3.0.6-orig/netlogic/game.cpp Maelstrom-3.0.6/netlogic/game.cpp
---- Maelstrom-3.0.6-orig/netlogic/game.cpp	2001-07-23 11:24:03 +0900
-+++ Maelstrom-3.0.6/netlogic/game.cpp	2003-05-21 11:33:19 +0900
-@@ -232,7 +232,7 @@
- 
- 			lastDisplayed = gDisplayed;
- 			screen->FillRect(0, 0, SCREEN_WIDTH, 12, ourBlack);
--			sprintf(caption,
-+			snprintf(caption, sizeof(caption),
- 				"You are player %d --- displaying player %d",
- 						gOurPlayer+1, gDisplayed+1);
- 			DrawText(SPRITES_WIDTH, 11, caption, geneva,
-@@ -357,7 +357,7 @@
- 				/* -- Erase old and draw new score */
- 				screen->FillRect(45, gStatusLine+1,
- 					score_width, text_height, ourBlack);
--				sprintf(numbuf, "%d", Score);
-+				snprintf(numbuf, sizeof(numbuf), "%d", Score);
- 				score_width = DrawText(45, gStatusLine+11, 
- 						numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
-@@ -380,7 +380,7 @@
- 		if (lastWave != gWave) {
- 			screen->FillRect(255, gStatusLine+1,
- 					wave_width, text_height, ourBlack);
--			sprintf(numbuf, "%d", gWave);
-+			snprintf(numbuf, sizeof(numbuf), "%d", gWave);
- 			wave_width = DrawText(255, gStatusLine+11, 
- 					numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
-@@ -391,7 +391,7 @@
- 		if (lastLives != Lives) {
- 			screen->FillRect(319, gStatusLine+1,
- 					lives_width, text_height, ourBlack);
--			sprintf(numbuf, "%-3.1d", Lives);
-+			snprintf(numbuf, sizeof(numbuf), "%-3.1d", Lives);
- 			lives_width = DrawText(319, gStatusLine+11,
- 					numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
-@@ -402,7 +402,7 @@
- 		if (lastBonus != Bonus) {
- 			screen->FillRect(384, gStatusLine+1,
- 					bonus_width, text_height, ourBlack);
--			sprintf(numbuf, "%-7.1d", Bonus);
-+			snprintf(numbuf, sizeof(numbuf), "%-7.1d", Bonus);
- 			bonus_width = DrawText(384, gStatusLine+11,
- 					numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
-@@ -414,7 +414,7 @@
- 			if (lastFrags != Frags) {
- 				screen->FillRect(fragoff, gStatusLine+1,
- 					frags_width, text_height, ourBlack);
--				sprintf(numbuf, "%-3.1d", Frags);
-+				snprintf(numbuf, sizeof(numbuf), "%-3.1d", Frags);
- 				frags_width = DrawText(fragoff, gStatusLine+11,
- 						numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
-@@ -747,10 +747,11 @@
- 		for ( i=0; i<gNumPlayers; ++i ) {
- 			char buffer[BUFSIZ], num1[12], num2[12];
- 
--			sprintf(num1, "%7.1d", final[i].Score);
--			sprintf(num2, "%3.1d", final[i].Frags);
--			sprintf(buffer, "Player %d: %-.7s Points, %-.3s Frags",
--						final[i].Player, num1, num2);
-+			snprintf(num1, sizeof(num1), "%7.1d", final[i].Score);
-+			snprintf(num2, sizeof(num2), "%3.1d", final[i].Frags);
-+			snprintf(buffer, sizeof(buffer),
-+				 "Player %d: %-.7s Points, %-.3s Frags",
-+				 final[i].Player, num1, num2);
- 			DrawText(160, 380+i*newyork_height, buffer,
- 				newyork, STYLE_NORM, 30000>>8, 30000>>8, 0xFF);
- 		}
-@@ -898,7 +899,7 @@
- 	
- 
- 	/* -- Draw the wave completed message */
--	sprintf(numbuf, "Wave %d completed.", gWave);
-+	snprintf(numbuf, sizeof(numbuf), "Wave %d completed.", gWave);
- 	sw = fontserv->TextWidth(numbuf, geneva, STYLE_BOLD);
- 	x = (SCREEN_WIDTH - sw) / 2;
- 	DrawText(x,  150, numbuf, geneva, STYLE_BOLD, 0xFF, 0xFF, 0x00);
-@@ -935,7 +936,7 @@
- 		if (OurShip->GetBonusMult() != 1) {
- 			SDL_Surface *sprite;
- 
--			sprintf(numbuf, "%-5.1d", OurShip->GetBonus());
-+			snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus());
- 			DrawText(x, 200, numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
- 			x += 75;
-@@ -951,10 +952,10 @@
- 	Delay(SOUND_DELAY);
- 	sound->PlaySound(gFunk, 5);
- 
--	sprintf(numbuf, "%-5.1d", OurShip->GetBonus());
-+	snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus());
- 	bonus_width = DrawText(x, 200, numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
--	sprintf(numbuf, "%-5.1d", OurShip->GetScore());
-+	snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetScore());
- 	score_width = DrawText(xt, 220, numbuf, geneva, STYLE_BOLD,
- 							0xFF, 0xFF, 0xFF);
- 	screen->Update();
-@@ -997,12 +998,12 @@
- 	
- 			screen->FillRect(x, 200-text_height+2,
- 					bonus_width, text_height, ourBlack);
--			sprintf(numbuf, "%-5.1d", OurShip->GetBonus());
-+			snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetBonus());
- 			bonus_width = DrawText(x, 200, numbuf,
- 					geneva, STYLE_BOLD, 0xFF, 0xFF, 0xFF);
- 			screen->FillRect(xt, 220-text_height+2,
- 					score_width, text_height, ourBlack);
--			sprintf(numbuf, "%-5.1d", OurShip->GetScore());
-+			snprintf(numbuf, sizeof(numbuf), "%-5.1d", OurShip->GetScore());
- 			score_width = DrawText(xt, 220, numbuf,
- 					geneva, STYLE_BOLD, 0xFF, 0xFF, 0xFF);
- 
-@@ -1015,7 +1016,7 @@
- 	HandleEvents(10);
- 
- 	/* -- Draw the "next wave" message */
--	sprintf(numbuf, "Prepare for Wave %d...", gWave+1);
-+	snprintf(numbuf, sizeof(numbuf), "Prepare for Wave %d...", gWave+1);
- 	sw = fontserv->TextWidth(numbuf, geneva, STYLE_BOLD);
- 	x = (SCREEN_WIDTH - sw)/2;
- 	DrawText(x, 259, numbuf, geneva, STYLE_BOLD, 0xFF, 0xFF, 0x00);
-diff -ur Maelstrom-3.0.6-orig/netlogic/netplay.cpp Maelstrom-3.0.6/netlogic/netplay.cpp
---- Maelstrom-3.0.6-orig/netlogic/netplay.cpp	2002-10-20 13:11:52 +0900
-+++ Maelstrom-3.0.6/netlogic/netplay.cpp	2003-05-21 11:31:43 +0900
-@@ -670,7 +670,9 @@
- 		strcpy(message, "Waiting for players:");
- 		for ( i=0; i<gNumPlayers; ++i ) {
- 			if ( ! acked[i] )
--				sprintf(&message[strlen(message)], " %d", i+1);
-+				snprintf(&message[strlen(message)],
-+					 sizeof(message)-strlen(message),
-+					 " %d", i+1);
- 		}
- 		Message(message);
- 
-@@ -725,7 +727,7 @@
- 			/* Check the player... */
- 			if ( (i != gOurPlayer) && (netbuf[1] == gOurPlayer) ) {
- 				/* Print message, sleep 3 seconds absolutely */
--				sprintf(message, 
-+			  snprintf(message, sizeof(message),
- 	"Error: Another player (%d) thinks they are player 1!\r\n", i+1);
- 				ErrorMessage(message);
- 				/* Suck up retransmission packets */
-diff -ur Maelstrom-3.0.6-orig/netscore.cpp Maelstrom-3.0.6/netscore.cpp
---- Maelstrom-3.0.6-orig/netscore.cpp	2001-07-23 12:25:17 +0900
-+++ Maelstrom-3.0.6/netscore.cpp	2003-05-21 11:27:18 +0900
-@@ -59,7 +59,7 @@
- 
- 	/* Send the scores */
- 	crc = get_checksum(key, KEY_LEN);
--	sprintf(netbuf, SCOREFMT, crc, high.name, high.score, high.wave);
-+	snprintf(netbuf, sizeof(netbuf), SCOREFMT, crc, high.name, high.score, high.wave);
- 	SDLNet_TCP_Send(remote, netbuf, strlen(netbuf));
- 	n = SDLNet_TCP_Recv(remote, netbuf, 1024);
- 	if ( n > 0 ) {
-diff -ur Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.cpp Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp
---- Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.cpp	2001-07-23 06:03:13 +0900
-+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.cpp	2003-05-21 11:31:01 +0900
-@@ -628,7 +628,7 @@
- 
- 		found = 0;
- 		for ( which=0; !found; ++which ) {
--			sprintf(file, "%s%d.bmp", prefix, which);
-+			snprintf(file, sizeof(file), "%s%d.bmp", prefix, which);
- 			if ( ((fp=fopen(file, "r")) == NULL) &&
- 			     ((fp=fopen(file, "w")) != NULL) ) {
- 				found = 1;
-diff -ur Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.h Maelstrom-3.0.6/screenlib/SDL_FrameBuf.h
---- Maelstrom-3.0.6-orig/screenlib/SDL_FrameBuf.h	2000-09-25 02:55:39 +0900
-+++ Maelstrom-3.0.6/screenlib/SDL_FrameBuf.h	2003-05-21 11:27:41 +0900
-@@ -165,7 +165,7 @@
- 		va_list ap;
- 
- 		va_start(ap, fmt);
--		vsprintf(errbuf, fmt, ap);
-+		vsnprintf(errbuf, sizeof(errbuf), fmt, ap);
- 		va_end(ap);
- 		errstr = errbuf;
-         }
diff --git a/games-action/maelstrom/maelstrom-3.0.5.ebuild b/games-action/maelstrom/maelstrom-3.0.5.ebuild
deleted file mode 100644
index 228724664c64..000000000000
--- a/games-action/maelstrom/maelstrom-3.0.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/maelstrom-3.0.5.ebuild,v 1.4 2004/06/24 21:56:48 agriffis Exp $
-
-MY_P=Maelstrom-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An asteroids battle game"
-SRC_URI="http://www.devolution.com/~slouken/Maelstrom/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.devolution.com/~slouken/Maelstrom/"
-
-KEYWORDS="x86 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.5
-	>=media-libs/sdl-net-1.2.2"
-
-src_install() {
-	einstall || die
-	dodoc ChangeLog README TODO DIFFERENCES INTERESTING-COMBINATIONS
-}
diff --git a/games-action/maelstrom/maelstrom-3.0.6.ebuild b/games-action/maelstrom/maelstrom-3.0.6.ebuild
deleted file mode 100644
index 08e71a3a98a8..000000000000
--- a/games-action/maelstrom/maelstrom-3.0.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/maelstrom/maelstrom-3.0.6.ebuild,v 1.8 2004/06/24 21:56:48 agriffis Exp $
-
-inherit eutils games
-
-MY_P=Maelstrom-${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="An asteroids battle game"
-SRC_URI="http://www.devolution.com/~slouken/Maelstrom/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.devolution.com/~slouken/Maelstrom/"
-
-KEYWORDS="x86 ppc alpha"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-libs/libsdl-1.1.5
-	>=media-libs/sdl-net-1.2.2"
-
-pkg_setup() {
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A} ; cd ${S}
-
-	epatch ${FILESDIR}/${P}-security.patch
-
-	# Remove redundant games in directory
-	sed -i -e 's/\/games\//\//g' configure
-}
-
-src_install() {
-	egamesinstall || die
-	dodoc ChangeLog README TODO DIFFERENCES INTERESTING-COMBINATIONS
-
-	insinto /usr/share/pixmaps
-	newins ${D}/usr/games/Maelstrom/icon.xpm maelstrom.xpm
-	make_desktop_entry Maelstrom "Maelstrom" maelstrom.xpm
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-}
diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog
index d9bd917cbd6a..ec13f584fbd1 100644
--- a/games-fps/doomsday/ChangeLog
+++ b/games-fps/doomsday/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doomsday
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.8 2005/01/25 02:45:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.9 2005/08/09 21:22:57 mr_bones_ Exp $
+
+  09 Aug 2005; Michael Sterrett <mr_bones_@gentoo.org>
+  -doomsday-1.8.0.ebuild, -doomsday-1.8.1.ebuild, -doomsday-1.8.3.ebuild:
+  clean old versions
 
 *doomsday-1.8.6 (24 Jan 2005)
 
diff --git a/games-fps/doomsday/doomsday-1.8.0.ebuild b/games-fps/doomsday/doomsday-1.8.0.ebuild
deleted file mode 100644
index 3a99b79f6ae9..000000000000
--- a/games-fps/doomsday/doomsday-1.8.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.8.0.ebuild,v 1.2 2005/01/25 02:45:01 vapier Exp $
-
-inherit games eutils
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/deng-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="openal"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	openal? ( media-libs/openal )"
-
-S=${WORKDIR}/deng-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-filename-case.patch
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "egamesinstall failed"
-	rmdir ${D}/${GAMES_PREFIX}/include
-	mv ${D}/${GAMES_DATADIR}/{deng/Data/jDoom,doom-data}
-	dosym ${GAMES_DATADIR}/doom-data ${GAMES_DATADIR}/deng/Data/jDoom
-
-	local game
-	for game in jdoom jheretic jhexen ; do
-		newgamesbin ${FILESDIR}/wrapper ${game}
-		dosed "s:GAME:${game}:" ${GAMES_BINDIR}/${game}
-	done
-
-	dodoc Doc/*.txt Doc/*/*.txt README
-	prepgamesdirs
-}
diff --git a/games-fps/doomsday/doomsday-1.8.1.ebuild b/games-fps/doomsday/doomsday-1.8.1.ebuild
deleted file mode 100644
index 15a102d1ce09..000000000000
--- a/games-fps/doomsday/doomsday-1.8.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.8.1.ebuild,v 1.4 2005/01/25 02:45:01 vapier Exp $
-
-inherit games eutils
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/deng-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="openal"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	openal? ( media-libs/openal )"
-
-S=${WORKDIR}/deng-${PV}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-#	epatch ${FILESDIR}/${PV}-filename-case.patch
-#	epatch ${FILESDIR}/${PV}-ambient-light.patch
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "egamesinstall failed"
-	rmdir ${D}/${GAMES_PREFIX}/include
-	mv ${D}/${GAMES_DATADIR}/{deng/Data/jDoom,doom-data}
-	dosym ${GAMES_DATADIR}/doom-data ${GAMES_DATADIR}/deng/Data/jDoom
-
-	local game
-	for game in jdoom jheretic jhexen ; do
-		newgamesbin ${FILESDIR}/wrapper ${game}
-		dosed "s:GAME:${game}:" ${GAMES_BINDIR}/${game}
-	done
-
-	dodoc Doc/*.txt Doc/*/*.txt README
-	prepgamesdirs
-}
diff --git a/games-fps/doomsday/doomsday-1.8.3.ebuild b/games-fps/doomsday/doomsday-1.8.3.ebuild
deleted file mode 100644
index 4fd8d95be2ac..000000000000
--- a/games-fps/doomsday/doomsday-1.8.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.8.3.ebuild,v 1.3 2005/01/25 02:45:01 vapier Exp $
-
-inherit eutils games
-
-DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen"
-HOMEPAGE="http://www.doomsdayhq.com/"
-SRC_URI="mirror://sourceforge/deng/deng-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="openal"
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl
-	media-libs/sdl-mixer
-	media-libs/sdl-net
-	openal? ( media-libs/openal )"
-
-S="${WORKDIR}/deng-${PV}"
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	rmdir "${D}/${GAMES_PREFIX}/include"
-	mv "${D}/${GAMES_DATADIR}/"{deng/Data/jDoom,doom-data}
-	dosym "${GAMES_DATADIR}/doom-data" "${GAMES_DATADIR}/deng/Data/jDoom"
-
-	local game
-	for game in jdoom jheretic jhexen ; do
-		newgamesbin "${FILESDIR}/wrapper" ${game}
-		sed -i \
-			-e "s:GAME:${game}:" "${D}"/${GAMES_BINDIR}/${game} \
-			|| die "sed ${GAMES_BINDIR}/${game} failed"
-	done
-
-	dodoc Doc/*.txt Doc/*/*.txt README
-	prepgamesdirs
-}
diff --git a/games-fps/doomsday/files/digest-doomsday-1.8.0 b/games-fps/doomsday/files/digest-doomsday-1.8.0
deleted file mode 100644
index 1d5461e2195c..000000000000
--- a/games-fps/doomsday/files/digest-doomsday-1.8.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2cb177b22ea43239d1d16fa43e19dc63 deng-1.8.0.tar.gz 3070052
diff --git a/games-fps/doomsday/files/digest-doomsday-1.8.1 b/games-fps/doomsday/files/digest-doomsday-1.8.1
deleted file mode 100644
index 37367c61cb5f..000000000000
--- a/games-fps/doomsday/files/digest-doomsday-1.8.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 972e34e6a44aa80090501bbae936a7c8 deng-1.8.1.tar.gz 3140581
diff --git a/games-fps/doomsday/files/digest-doomsday-1.8.3 b/games-fps/doomsday/files/digest-doomsday-1.8.3
deleted file mode 100644
index b071363e92fe..000000000000
--- a/games-fps/doomsday/files/digest-doomsday-1.8.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b27d03b61487b87bf46bfe789f98ba34 deng-1.8.3.tar.gz 3142732