games-fps/vavoom: Added patch to get rid of executable wrappers, added 'asm' USE flag

svn path=/sunrise/; revision=4006

5 files changed, 127 insertions, 27 deletions

diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog
index c22913e24..8aedff893 100644
--- a/games-fps/vavoom/ChangeLog
+++ b/games-fps/vavoom/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2007; Davide Cendron (scen) <scen@gentoo.org> vavoom-1.24.ebuild,
+  vavoom-9999.ebuild, +files/vavoom-makefile_nowrapper.patch:
+  Added patch to get rid of executable wrappers, added 'asm' USE flag
+
   18 Jun 2007; Davide Cendron (scen) <scen@gentoo.org> vavoom-9999.ebuild:
   Updated ESVN_REPO_URI (like explained in Sourceforge instructions)
 
diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest
index 7c945b94c..949d34691 100644
--- a/games-fps/vavoom/Manifest
+++ b/games-fps/vavoom/Manifest
@@ -1,5 +1,6 @@
+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.ebuild 6725 RMD160 d472142324f82a15d0ebc29fd444070abb4fbb19 SHA1 06c6952d1fb8b8df97481987f446cefa1a847b24 SHA256 ba736b4856f10f3f21c2dd054bc70e17dee9e127f41419f4ff09fbdf9a7329f8
-EBUILD vavoom-9999.ebuild 6721 RMD160 ea09ff4fb45ee7585712c11ff2feaecda2ddf67c SHA1 1a63ce20159851e52d90b44cffd661e857a03962 SHA256 69bd914d5c76a4b619be5aee4ee5fcd38430df63aa980df1772433c9cbf98732
-MISC ChangeLog 1122 RMD160 e234251f891d7cf2d392d6bdd3b3e5ba29057479 SHA1 af82e5c515c156439c0ded9f50a1bdb0b2616be1 SHA256 9e0c2f0d720aa94ff5d61b1697771697b2e396ae13a6a49ef18b3699747918ac
+EBUILD vavoom-1.24.ebuild 6575 RMD160 b202ca2411481bf1417a9be91f005fcd53529cbb SHA1 5e17e9a79034e5d9201ea806e338b3c32e19b3ee SHA256 25275039f84f75c342fe0f589f335e4597cc9bbd00097f99828f5aedc5445116
+EBUILD vavoom-9999.ebuild 6638 RMD160 88680abccf69b37a683ce62f5c07b30802f635eb SHA1 ae319c753ba2dceff03d36680e05b3ed1684e960 SHA256 c5c5aeb45ac209c054f4299071742be9fdfb914b99ed8dcca1d73fa7662d6526
+MISC ChangeLog 1330 RMD160 f137f3e6eb2c7867e3b736e2a7db2a52ddba0760 SHA1 3fff68b8d7e9e5be35bf4c91d152db13d5fd58b3 SHA256 7e1528207f9c2e4a0250eea948e69fc6291056a1d3685394fbadc9a76b344a28
 MISC metadata.xml 303 RMD160 626272995441b20fd23b1d0a94603e98b97b0f1e SHA1 f3cae1ec3568e7717d7265a58d0b2e6d8efe88b5 SHA256 334d9b64af3b010a9fcdcbd8736eba2f81ff9d87dee3eb76b5adacb7d48afa37
diff --git a/games-fps/vavoom/files/vavoom-makefile_nowrapper.patch b/games-fps/vavoom/files/vavoom-makefile_nowrapper.patch
new file mode 100644
index 000000000..ccb2f8d8f
--- /dev/null
+++ b/games-fps/vavoom/files/vavoom-makefile_nowrapper.patch
@@ -0,0 +1,106 @@
+--- source/Makefile.am	2007-06-21 21:25:49.000000000 +0200
++++ source/Makefile.am	2007-06-21 21:27:27.000000000 +0200
+@@ -19,12 +19,6 @@
+ 
+ if ENABLE_CLIENT
+ bin_PROGRAMS += ../$(MAIN_EXE)
+-if MAIN_PLATFORM_UNIX_ALLEGRO
+-bin_SCRIPTS += vavoom
+-endif
+-if MAIN_PLATFORM_UNIX_SDL
+-bin_SCRIPTS += vavoom
+-endif
+ endif
+ 
+ _____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@
+@@ -405,25 +399,8 @@
+ 	gl_win32.cpp
+ endif
+ 
+-vavoom: Makefile
+-	echo "#!/bin/sh" > $@
+-	echo "# Needed to make symlinks/shortcuts work." >> $@
+-	echo "# the binaries must run with correct working directory" >> $@
+-	echo "cd \"$(datadir)/vavoom\"" >> $@
+-	echo "\"$(bindir)/$(MAIN_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
+-	echo "exit \$$?" >> $@
+-
+-#---------------------------------------
+-#
+-#	Dedicated server
+-#
+-#---------------------------------------
+-
+ if ENABLE_SERVER
+ bin_PROGRAMS += ../$(SERVER_EXE)
+-if SERVER_PLATFORM_UNIX
+-bin_SCRIPTS += vavoom-dedicated
+-endif
+ endif
+ 
+ _____SERVER_EXE__CPPFLAGS = @SV_CPPFLAGS@ -DSERVER
+@@ -534,14 +511,6 @@
+ 	vavoom.rc
+ endif
+ 
+-vavoom-dedicated: Makefile
+-	echo "#!/bin/sh" > $@
+-	echo "# Needed to make symlinks/shortcuts work." >> $@
+-	echo "# the binaries must run with correct working directory" >> $@
+-	echo "cd \"$(datadir)/vavoom\"" >> $@
+-	echo "\"$(bindir)/$(SERVER_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
+-	echo "exit \$$?" >> $@
+-
+ # ---------------------------------------
+ #
+ #	Compilation of Windows resources
+--- source/Makefile.in	2007-06-21 21:25:59.000000000 +0200
++++ source/Makefile.in	2007-06-21 21:30:49.000000000 +0200
+@@ -46,8 +46,6 @@
+ #
+ #---------------------------------------
+ @ENABLE_CLIENT_TRUE@am__append_1 = ../$(MAIN_EXE)
+-@ENABLE_CLIENT_TRUE@@MAIN_PLATFORM_UNIX_ALLEGRO_TRUE@am__append_2 = vavoom
+-@ENABLE_CLIENT_TRUE@@MAIN_PLATFORM_UNIX_SDL_TRUE@am__append_3 = vavoom
+ 
+ #-- i386 assembler files --
+ @MAIN_ASM_I386_TRUE@am__append_4 = \
+@@ -199,7 +197,6 @@
+ #
+ #---------------------------------------
+ @ENABLE_SERVER_TRUE@am__append_21 = ../$(SERVER_EXE)
+-@ENABLE_SERVER_TRUE@@SERVER_PLATFORM_UNIX_TRUE@am__append_22 = vavoom-dedicated
+ @SERVER_PLATFORM_DJGPP_TRUE@am__append_23 = \
+ @SERVER_PLATFORM_DJGPP_TRUE@	mplib.c \
+ @SERVER_PLATFORM_DJGPP_TRUE@	mplpc.c \
+@@ -828,7 +825,6 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = timidity
+-bin_SCRIPTS = $(am__append_2) $(am__append_3) $(am__append_22)
+ _____MAIN_EXE__CPPFLAGS = @MAIN_CPPFLAGS@
+ _____MAIN_EXE__CXXFLAGS = @MAIN_CXXFLAGS@
+ _____MAIN_EXE__DEFS = 
+@@ -5184,22 +5180,6 @@
+ 	uninstall-dist_baseDATA uninstall-info-am
+ 
+ 
+-vavoom: Makefile
+-	echo "#!/bin/sh" > $@
+-	echo "# Needed to make symlinks/shortcuts work." >> $@
+-	echo "# the binaries must run with correct working directory" >> $@
+-	echo "cd \"$(datadir)/vavoom\"" >> $@
+-	echo "\"$(bindir)/$(MAIN_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
+-	echo "exit \$$?" >> $@
+-
+-vavoom-dedicated: Makefile
+-	echo "#!/bin/sh" > $@
+-	echo "# Needed to make symlinks/shortcuts work." >> $@
+-	echo "# the binaries must run with correct working directory" >> $@
+-	echo "cd \"$(datadir)/vavoom\"" >> $@
+-	echo "\"$(bindir)/$(SERVER_EXE)\" \$$* $(IWADDIR_PARM)" >> $@
+-	echo "exit \$$?" >> $@
+-
+ # ---------------------------------------
+ #
+ #	Compilation of Windows resources
diff --git a/games-fps/vavoom/vavoom-1.24.ebuild b/games-fps/vavoom/vavoom-1.24.ebuild
index e3b3a665f..53239eed4 100644
--- a/games-fps/vavoom/vavoom-1.24.ebuild
+++ b/games-fps/vavoom/vavoom-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="allegro debug dedicated external-glbsp flac mad mikmod models music
+IUSE="allegro asm debug dedicated external-glbsp flac mad mikmod models music
 openal opengl sdl textures tools vorbis"
 
 QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
@@ -130,6 +130,9 @@ src_unpack() {
 	unpack "${A}"
 	cd "${S}"
 
+	# Patch Makefiles to get rid of executable wrappers
+	epatch ${FILESDIR}/${PN}-makefile_nowrapper.patch || die "epatch failed"
+
 	# Set shared directory
 	sed -i \
 		-e "s:fl_basedir = \".\":fl_basedir = \"${dir}\":" \
@@ -171,6 +174,7 @@ src_compile() {
 		$(use_with mad libmad) \
 		$(use_with mikmod) \
 		$(use_with flac) \
+		$(use_enable asm) \
 		$(use_enable dedicated server) \
 		$(use_enable debug) \
 		$(use_enable debug zone-debug) \
@@ -188,9 +192,6 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	# Remove unwanted wrapper scripts
-	rm -f "${D}/${GAMES_BINDIR}/${PN}*"
-
 	# Remove unneeded icon
 	rm -f "${D}/${dir}/${PN}.png"
 
@@ -198,15 +199,8 @@ src_install() {
 
 	# Enable OpenGL in desktop entry, if relevant USE flag is enabled
 	use opengl && de_cmd="${PN} -opengl"
-	# Install properly main game binary exe
-	dogamesbin ${PN} || die "dogamesbin ${PN} failed"
 	make_desktop_entry "${de_cmd}" "Vavoom"
 
-	if use dedicated ; then
-		# Install properly dedicated server binary exe
-		dogamesbin ${PN}-ded || die "dogamesbin ${PN}-ded failed"
-	fi
-
 	dodoc docs/${PN}.txt || die "dodoc vavoom.txt failed"
 
 	if use tools; then
diff --git a/games-fps/vavoom/vavoom-9999.ebuild b/games-fps/vavoom/vavoom-9999.ebuild
index a6093c164..221daa208 100644
--- a/games-fps/vavoom/vavoom-9999.ebuild
+++ b/games-fps/vavoom/vavoom-9999.ebuild
@@ -11,7 +11,7 @@ ESVN_REPO_URI="https://vavoom.svn.sourceforge.net/svnroot/vavoom/trunk/vavoom"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="allegro debug dedicated external-glbsp flac mad mikmod models music
+IUSE="allegro asm debug dedicated external-glbsp flac mad mikmod models music
 openal opengl sdl textures tools vorbis"
 
 QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
@@ -132,6 +132,9 @@ src_unpack() {
 
 	./autogen.sh
 
+	# Patch Makefiles to get rid of executable wrappers
+	epatch ${FILESDIR}/${PN}-makefile_nowrapper.patch || die "epatch failed"
+
 	# Set shared directory
 	sed -i \
 		-e "s:fl_basedir = \".\":fl_basedir = \"${dir}\":" \
@@ -173,6 +176,7 @@ src_compile() {
 		$(use_with mad libmad) \
 		$(use_with mikmod) \
 		$(use_with flac) \
+		$(use_enable asm) \
 		$(use_enable dedicated server) \
 		$(use_enable debug) \
 		$(use_enable debug zone-debug) \
@@ -180,8 +184,9 @@ src_compile() {
 		--disable-dependency-tracking \
 		|| die "egamesconf failed"
 
-	# Parallel compiling doesn't work for now :(
-	emake -j1 || die "emake failed"
+	# Parallel compiling seems to work (tested on 1.24)
+	# I hope it would be true :P (in case i'll re-enable it later)
+	emake || die "emake failed"
 }
 
 src_install() {
@@ -189,9 +194,6 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	# Remove unwanted wrapper scripts
-	rm -f "${D}/${GAMES_BINDIR}/${PN}*"
-
 	# Remove unneeded icon
 	rm -f "${D}/${dir}/${PN}.png"
 
@@ -199,15 +201,8 @@ src_install() {
 
 	# Enable OpenGL in desktop entry, if relevant USE flag is enabled
 	use opengl && de_cmd="${PN} -opengl"
-	# Install properly main game binary exe
-	dogamesbin ${PN} || die "dogamesbin ${PN} failed"
 	make_desktop_entry "${de_cmd}" "Vavoom"
 
-	if use dedicated ; then
-		# Install properly dedicated server binary exe
-		dogamesbin ${PN}-ded || die "dogamesbin ${PN}-ded failed"
-	fi
-
 	dodoc docs/${PN}.txt || die "dodoc vavoom.txt failed"
 
 	if use tools; then