games-fps/vavoom: Version bump (and updated dependencies for SVN live ebuild)

svn path=/sunrise/; revision=4749

5 files changed, 39 insertions, 186 deletions

diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog
index dbc149258..29f109c74 100644
--- a/games-fps/vavoom/ChangeLog
+++ b/games-fps/vavoom/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  08 Oct 2007; Davide Cendron (scen) <scen@gentoo.org>
+  -files/1.24-vulnerabilities.patch, -vavoom-1.24-r1.ebuild,
+  +vavoom-1.25.ebuild, vavoom-9999.ebuild:
+  Version bump (and updated dependencies for SVN live ebuild)
+
   01 Oct 2007; Davide Cendron (scen) <scen@gentoo.org>
   +files/1.24-vulnerabilities.patch, -vavoom-1.24.ebuild,
   +vavoom-1.24-r1.ebuild:
diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest
index 3141b0e76..c8b621846 100644
--- a/games-fps/vavoom/Manifest
+++ b/games-fps/vavoom/Manifest
@@ -1,7 +1,6 @@
-AUX 1.24-vulnerabilities.patch 4492 RMD160 01a907d0e8d3dbbf75ce7cb653bc9702316ce378 SHA1 ef3b66c952e96bacc2c1206b61cefbb18d2fe6eb SHA256 ad3dcf387ba376b9d614cabf1034862dac6473d51b8f66d493105d507aad3d1e
 AUX vavoom-makefile_nowrapper.patch 3235 RMD160 b04e87de8068e2d290387998d34701e2a3a58b30 SHA1 5e5f3b0da0c9ca975cb9606e5684bb5e21e3d7de SHA256 23266e9e536cafb766155d6b6899f358d7dd0489ce61e2b9bec9ec567d0ac7d9
-DIST vavoom-1.24.tar.bz2 1683706 RMD160 67ca05a0576516782c5063975ff07065216915ce SHA1 fd0fc36649faec8b8dc3123eddb52664391bacda SHA256 26d9f036f8429924d71dc16d805e9272b3c44cccc2067e82cb632170a21dd80b
-EBUILD vavoom-1.24-r1.ebuild 6606 RMD160 ec980f346f2d781597a993081352db3b4f42a01b SHA1 b59927ff52fc97be55781958c0f2fed256aa6c9b SHA256 7c5baae854fdfc77257699be11cdccfa865ebf4531dd7a34672e0e3bf0434157
-EBUILD vavoom-9999.ebuild 7259 RMD160 6a28510de27c2aafea800d4f3dac265d224c6ef3 SHA1 f2db7cc962841235794fb70243b532801ecbcc18 SHA256 90ebb17b3962a34d1484a29f08616f7560874e610c20e19292d9eb0a9dd156fb
-MISC ChangeLog 2323 RMD160 a7eabe858cffda73e4d98ef9a2dc80c52c1b7332 SHA1 3a20a205b9a58ea354506011d58893298dbbe97a SHA256 a3bedb428b13ae1b0e62ed46d40bc002fda767169b6f5aadf1e7a640ada7f478
+DIST vavoom-1.25.tar.bz2 1731228 RMD160 fd974a5fabec6501b4683784367f2f616373c55d SHA1 d0ef203ef614318ed6ac0040f8da5d76cf8770d4 SHA256 bba1ac08ff82ca77da684af049ac68fa16dbb099755e41372b82ec6817b140ba
+EBUILD vavoom-1.25.ebuild 7196 RMD160 30305508525b7705f95fccd700f82a9722ac40df SHA1 671b56ded1c4e02a4a45d8b0a45182afac02860c SHA256 8a25d5d2f1e7d767ac39c492ddbbaa951637e3e80cd5561b511dae9e400e887a
+EBUILD vavoom-9999.ebuild 7259 RMD160 6a890fb7a22767f5e20017f2fcdb6debd29f38fc SHA1 40a8d10cb70374dc3162883cf35825a49aacef5d SHA256 17fb318724357d0fba3132030ef9888b3ed956c75ebdb389ab19d08a842ad384
+MISC ChangeLog 2545 RMD160 5b9087b880e881e48d7700f63d9cb8b1ff0a85d5 SHA1 69fa88672dcfefafdff288cda1aef49804e78dd1 SHA256 33bd6bb32e080693efaae747dc9db09ab6dfa32d1b2473282f2fe1ca1621a093
 MISC metadata.xml 303 RMD160 626272995441b20fd23b1d0a94603e98b97b0f1e SHA1 f3cae1ec3568e7717d7265a58d0b2e6d8efe88b5 SHA256 334d9b64af3b010a9fcdcbd8736eba2f81ff9d87dee3eb76b5adacb7d48afa37
diff --git a/games-fps/vavoom/files/1.24-vulnerabilities.patch b/games-fps/vavoom/files/1.24-vulnerabilities.patch
deleted file mode 100644
index a652123fc..000000000
--- a/games-fps/vavoom/files/1.24-vulnerabilities.patch
+++ /dev/null
@@ -1,172 +0,0 @@
---- trunk/vavoom/source/p_acs.cpp	2007/08/29 22:11:13	2684
-+++ trunk/vavoom/source/p_acs.cpp	2007/08/31 16:30:40	2685
-@@ -2486,7 +2486,7 @@
- 			}
- 			else
- 			{
--				BroadcastCentrePrintf(*PrintStr);
-+				BroadcastCentrePrint(*PrintStr);
- 			}
- 			ACSVM_BREAK;
- 
-@@ -2649,7 +2649,7 @@
- 		ACSVM_CASE(PCD_EndPrintBold)
- 			//FIXME yellow message
- 			PrintStr = PrintStr.EvalEscapeSequences();
--			BroadcastCentrePrintf(*PrintStr);
-+			BroadcastCentrePrint(*PrintStr);
- 			ACSVM_BREAK;
- 
- 		//	Extended P-Code commands.
-@@ -2974,7 +2974,7 @@
- 			}
- 			else
- 			{
--				BroadcastCentrePrintf(*PrintStr);
-+				BroadcastCentrePrint(*PrintStr);
- 			}
- 			sp = optstart - 6;
- 			ACSVM_BREAK;
---- trunk/vavoom/source/p_thinker.cpp	2007/08/29 22:11:13	2684
-+++ trunk/vavoom/source/p_thinker.cpp	2007/08/31 16:30:40	2685
-@@ -294,6 +294,21 @@
- 
- //==========================================================================
- //
-+//	VThinker::BroadcastPrint
-+//
-+//==========================================================================
-+
-+void VThinker::BroadcastPrint(const char *s)
-+{
-+	guard(VThinker::BroadcastPrint);
-+	for (int i = 0; i < svs.max_clients; i++)
-+		if (Level->Game->Players[i])
-+			Level->Game->Players[i]->eventClientPrint(s);
-+	unguard;
-+}
-+
-+//==========================================================================
-+//
- //	VThinker::BroadcastPrintf
- //
- //==========================================================================
-@@ -308,9 +323,22 @@
- 	vsprintf(buf, s, v);
- 	va_end(v);
- 
-+	BroadcastPrint(buf);
-+	unguard;
-+}
-+
-+//==========================================================================
-+//
-+//	VThinker::BroadcastCentrePrint
-+//
-+//==========================================================================
-+
-+void VThinker::BroadcastCentrePrint(const char *s)
-+{
-+	guard(VThinker::BroadcastCentrePrint);
- 	for (int i = 0; i < svs.max_clients; i++)
- 		if (Level->Game->Players[i])
--			Level->Game->Players[i]->eventClientPrint(buf);
-+			Level->Game->Players[i]->eventClientCentrePrint(s);
- 	unguard;
- }
- 
-@@ -330,9 +358,7 @@
- 	vsprintf(buf, s, v);
- 	va_end(v);
- 
--	for (int i = 0; i < svs.max_clients; i++)
--		if (Level->Game->Players[i])
--			Level->Game->Players[i]->eventClientCentrePrint(buf);
-+	BroadcastCentrePrint(buf);
- 	unguard;
- }
- 
-@@ -444,7 +470,7 @@
- {
- 	VStr Msg = PF_FormatString();
- 	P_GET_SELF;
--	Self->BroadcastPrintf(*Msg);
-+	Self->BroadcastPrint(*Msg);
- }
- 
- IMPLEMENT_FUNCTION(VThinker, AllocDlight)
---- trunk/vavoom/source/p_thinker.h	2007/08/29 22:11:13	2684
-+++ trunk/vavoom/source/p_thinker.h	2007/08/31 16:30:40	2685
-@@ -76,7 +76,9 @@
- 	void AddSoundSequenceChoice(vint32, VName);
- 	void StopSoundSequence(vint32);
- 
-+	void BroadcastPrint(const char*);
- 	void BroadcastPrintf(const char*, ...);
-+	void BroadcastCentrePrint(const char*);
- 	void BroadcastCentrePrintf(const char*, ...);
- 
- 	DECLARE_FUNCTION(Spawn)
---- trunk/vavoom/source/screen.cpp	2007/08/29 19:43:24	2683
-+++ trunk/vavoom/source/screen.cpp	2007/08/29 22:11:13	2684
-@@ -203,6 +203,12 @@
- 	void	*data;
- 	char	filename[128];
- 
-+	if (strlen(screenshot_type) > 8)
-+	{
-+		GCon->Log("Screenshot extension too long");
-+		return;
-+	}
-+
- 	//	Find a file name to save it to
- 	VStr BaseDir = (fl_savedir ? fl_savedir : fl_basedir) + "/" + fl_gamedir;
- 	for (i = 0; i <= 9999; i++)
---- trunk/vavoom/source/str.h	2007/08/31 16:30:40	2685
-+++ trunk/vavoom/source/str.h	2007/08/31 17:25:55	2686
-@@ -345,6 +345,8 @@
- 		{
- 			vint32 Len;
- 			Strm << STRM_INDEX(Len);
-+			if (Len < 0)
-+				Len = 0;
- 			S.Resize(Len);
- 			if (Len)
- 				Strm.Serialise(S.Str, Len + 1);
---- trunk/vavoom/source/sv_main.cpp	2007/08/15 20:47:29	2647
-+++ trunk/vavoom/source/sv_main.cpp	2007/08/31 16:30:40	2685
-@@ -1431,14 +1431,14 @@
- COMMAND(Map)
- {
- 	guard(COMMAND Map);
--	char	mapname[12];
-+	VStr	mapname;
- 
- 	if (Args.Num() != 2)
- 	{
- 		GCon->Log("map <mapname> : change level");
- 		return;
- 	}
--	VStr::Cpy(mapname, *Args[1]);
-+	mapname = Args[1];
- 
- 	SV_ShutdownServer(false);
- #ifdef CLIENT
-@@ -1461,7 +1461,7 @@
- 	GGameInfo->netgame = svs.max_clients > 1;
- 	GGameInfo->eventInitNewGame(gameskill);
- 
--	SV_SpawnServer(mapname, true);
-+	SV_SpawnServer(*mapname, true);
- #ifdef CLIENT
- 	if (cls.state != ca_dedicated)
- 		GCmdBuf << "Connect local\n";
-@@ -1624,7 +1624,7 @@
- 		Text += " ";
- 		Text += Args[i];
- 	}
--	GLevelInfo->BroadcastPrintf(*Text);
-+	GLevelInfo->BroadcastPrint(*Text);
- 	GLevelInfo->StartSound(TVec(0, 0, 0), 0,
- 		GSoundManager->GetSoundID("misc/chat"), 0, 1.0, 0);
- 	unguard;
diff --git a/games-fps/vavoom/vavoom-1.24-r1.ebuild b/games-fps/vavoom/vavoom-1.25.ebuild
index e7ee75355..2facc54cd 100644
--- a/games-fps/vavoom/vavoom-1.24-r1.ebuild
+++ b/games-fps/vavoom/vavoom-1.25.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-inherit autotools eutils flag-o-matic games
+inherit autotools eutils flag-o-matic wxwidgets games
 
 DESCRIPTION="Advanced source port for Doom/Heretic/Hexen/Strife"
 HOMEPAGE="http://www.vavoom-engine.com/"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="allegro asm debug dedicated external-glbsp flac mad mikmod models music
-openal opengl sdl textures tools vorbis"
+openal opengl sdl textures tools vorbis wxwindows"
 
 QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
 
@@ -43,10 +43,11 @@ DEPEND="media-libs/libpng
 	mad? ( media-libs/libmad )
 	mikmod? ( media-libs/libmikmod )
 	openal? ( media-libs/openal )
-	external-glbsp? ( games-util/glbsp )"
+	external-glbsp? ( games-util/glbsp )
+	wxwindows? ( =x11-libs/wxGTK-2.6* )"
 RDEPEND="${DEPEND}
 	allegro? ( media-sound/timidity++ )"
-PDEPEND="models? ( >=games-fps/vavoom-models-1.4.1 )
+PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
 	music? ( games-fps/vavoom-music )
 	textures? ( games-fps/vavoom-textures )"
 
@@ -132,7 +133,6 @@ src_unpack() {
 
 	# Patch Makefiles to get rid of executable wrappers
 	epatch "${FILESDIR}/${PN}-makefile_nowrapper.patch"
-	epatch "${FILESDIR}/${PV}-vulnerabilities.patch"
 
 	# Set shared directory
 	sed -i \
@@ -155,6 +155,9 @@ src_compile() {
 		allegro="--without-allegro" \
 		sdl="--without-sdl"
 
+	export WX_GTK_VER="2.6"
+	need-wxwidgets gtk2
+
 	# Sdl is the default, unless sdl=off & allegro=on
 	if ! use sdl && use allegro ; then
 		allegro="--with-allegro"
@@ -179,8 +182,11 @@ src_compile() {
 		$(use_enable dedicated server) \
 		$(use_enable debug) \
 		$(use_enable debug zone-debug) \
+		$(use_enable wxwindows launcher) \
+		--with-wx-config=${WX_CONFIG} \
 		--with-iwaddir="${dir}" \
 		--disable-dependency-tracking \
+		--disable-maintainer-mode \
 		|| die "egamesconf failed"
 
 	# Parallel compiling seems to work (tested on 1.24)
@@ -196,20 +202,26 @@ src_install() {
 	# Remove unneeded icon
 	rm -f "${D}/${dir}/${PN}.png"
 
-	doicon source/${PN}.png || die "doicon failed"
-
 	# Enable OpenGL in desktop entry, if relevant USE flag is enabled
 	use opengl && de_cmd="${PN} -opengl"
+	doicon source/${PN}.png || die "doicon ${PN}.png failed"
 	make_desktop_entry "${de_cmd}" "Vavoom"
 
 	dodoc docs/${PN}.txt || die "dodoc vavoom.txt failed"
 
-	if use tools; then
+	if use tools ; then
 		# The tools are always built
 		dobin utils/bin/{acc,fixmd2,vcc,vlumpy} || die "dobin utils failed"
 		dodoc utils/vcc/vcc.txt || die "dodoc vcc.txt failed"
 	fi
 
+	if use wxwindows ; then
+		# Install graphical launcher
+		doicon utils/vlaunch/vlaunch.xpm || die "doicon vlaunch.xpm failed"
+		dogamesbin utils/bin/vlaunch || die "dogamesbin vlaunch failed"
+		make_desktop_entry "vlaunch" "Vavoom Launcher" "vlaunch.xpm"
+	fi
+
 	prepgamesdirs
 }
 
@@ -227,6 +239,15 @@ pkg_postinst() {
 	elog
 	elog "See documentation for further details."
 
+	if use wxwindows ; then
+		echo
+		elog "You've also installed a nice graphical launcher. Simply run:"
+		elog
+		elog "   vlaunch"
+		elog
+		elog "to enjoy it :)"
+	fi
+
 	if use tools; then
 		echo
 		elog "You have also installed some Vavoom-related utilities"
diff --git a/games-fps/vavoom/vavoom-9999.ebuild b/games-fps/vavoom/vavoom-9999.ebuild
index a0285b0b5..7a3e4a379 100644
--- a/games-fps/vavoom/vavoom-9999.ebuild
+++ b/games-fps/vavoom/vavoom-9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="media-libs/libpng
 	wxwindows? ( =x11-libs/wxGTK-2.6* )"
 RDEPEND="${DEPEND}
 	allegro? ( media-sound/timidity++ )"
-PDEPEND="models? ( >=games-fps/vavoom-models-1.4.1 )
+PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
 	music? ( games-fps/vavoom-music )
 	textures? ( games-fps/vavoom-textures )"