games-fps/vavoom: Updated cmake patch to reflect upstream changes. Introduced use of EAPI, and enabling "sdl" USE flag by default. Readded "vorbis" USE flag in SVN live ebuild, because a user would can enable Vorbis support, but not install the enhanced music files (see previous change by jakub); if "music" is on, and "vorbis" is off, Vorbis support is forcibly enabled.

svn path=/sunrise/; revision=5583

5 files changed, 42 insertions, 60 deletions

diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog
index fa4318f62..f3e850ef3 100644
--- a/games-fps/vavoom/ChangeLog
+++ b/games-fps/vavoom/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2008; Davide Cendron (scen) <scen@gentoo.org>
+  files/vavoom_cmake_build.patch, vavoom-1.26.ebuild, vavoom-9999.ebuild:
+  Updated cmake patch to reflect upstream changes. Introduced use of EAPI, and
+  enabling "sdl" USE flag by default. Readded "vorbis" USE flag in SVN live
+  ebuild, because a user would can enable Vorbis support, but not install the
+  enhanced music files (see previous change by jakub); if "music" is on, and
+  "vorbis" is off, Vorbis support is forcibly enabled.
+
   31 Jan 2008; Davide Cendron (scen) <scen@gentoo.org>
   +files/vavoom_cmake_build.patch, vavoom-9999.ebuild:
   Upstream has switched build system to CMake, so i've changed the SVN live
diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest
index 2b36ba799..e9fed7458 100644
--- a/games-fps/vavoom/Manifest
+++ b/games-fps/vavoom/Manifest
@@ -1,7 +1,7 @@
 AUX vavoom-makefile_nowrapper.patch 3235 RMD160 b04e87de8068e2d290387998d34701e2a3a58b30 SHA1 5e5f3b0da0c9ca975cb9606e5684bb5e21e3d7de SHA256 23266e9e536cafb766155d6b6899f358d7dd0489ce61e2b9bec9ec567d0ac7d9
-AUX vavoom_cmake_build.patch 2901 RMD160 2664ece4d8e3a19d1d0284647a464c0b946e6701 SHA1 39bd191d1839ad5987c9aff2cd49b076075ceba3 SHA256 e6eff3bfb227bc3d87c192f79df0028617c34212a8cd9fabab9b5f6566d842aa
+AUX vavoom_cmake_build.patch 2029 RMD160 963eccf7ba0d90b4b0516ab39a42484379169443 SHA1 5415e69d8d99f5f82b99cac56f02bb025a0fae61 SHA256 b9c53ae5304f048e50fedd29d5530eecc82da69bac32f511c736a61c38dcb2f5
 DIST vavoom-1.26.tar.bz2 1792895 RMD160 5f7cf2542f6bc4233c881fa14bc66b779e9bfe71 SHA1 ec75759d44f4557d4e90bd13ede19711e574597c SHA256 782b0c3c8f7f3fb32a9ea6f3a61e76c1f99ea956a2313e6f890da98bd66590ef
-EBUILD vavoom-1.26.ebuild 6449 RMD160 a8673cc64e5d165f7e11a8d0d666f96a94dc741e SHA1 40b3c40acb6414fba2de66b0611b792e0b3eae9d SHA256 2335b652f5dbb62cae7cf1cc531d22fdb03fe61bac18e100c3059ff2fcae6a75
-EBUILD vavoom-9999.ebuild 6524 RMD160 285b7b8e97dd2a5c657786c59fabe6d242ed1f88 SHA1 af4b387c46dda1781f5f822d5667931fbc6ce59c SHA256 8b1d5363e7fd254ed34143dabfab927f21dc41c000802661a812578739ee5382
-MISC ChangeLog 3399 RMD160 7fc716f08ab47648c651e326a092d11a285a2ebc SHA1 89f1fe34fc3937b42fa2562e5435b26416484741 SHA256 2d1710e9ae87e4e218842ea2752bbd611b5fb644387be27aac1e968e23b8a512
+EBUILD vavoom-1.26.ebuild 6461 RMD160 3030d0b1b01ac85412768128ff9a9372db905ecb SHA1 e92b9ce02ab4f5e688e85f837d87584b6f6d91c3 SHA256 fb217ed37e5a7048ad29892562a58aa49eb8226863d7485801bf320e2ab8d9c2
+EBUILD vavoom-9999.ebuild 6525 RMD160 81d483636aee361baf39bbbd85efd0caec1f9d18 SHA1 1fd58878b0f6b962814946cd56e3410dbe185aa7 SHA256 0b500ade2959095c48f7e8d05c0b814cc7bfcbb3f0250f4973258ca02555b358
+MISC ChangeLog 3894 RMD160 33290a38f1f02cb3bc28ea9a8689507270d8c47c SHA1 167ccdf1bb6a757af0fe42ea30a5e76bed981dda SHA256 3aa8b6fd658e23dab5c7c91df2fe706f24ba3163d327122b33a5c5aebc7681ce
 MISC metadata.xml 303 RMD160 626272995441b20fd23b1d0a94603e98b97b0f1e SHA1 f3cae1ec3568e7717d7265a58d0b2e6d8efe88b5 SHA256 334d9b64af3b010a9fcdcbd8736eba2f81ff9d87dee3eb76b5adacb7d48afa37
diff --git a/games-fps/vavoom/files/vavoom_cmake_build.patch b/games-fps/vavoom/files/vavoom_cmake_build.patch
index 034c9f75f..597c6a9e9 100644
--- a/games-fps/vavoom/files/vavoom_cmake_build.patch
+++ b/games-fps/vavoom/files/vavoom_cmake_build.patch
@@ -1,22 +1,5 @@
---- CMakeLists.txt	2008-01-31 22:32:53.000000000 +0100
-+++ CMakeLists.txt	2008-01-31 22:45:47.000000000 +0100
-@@ -16,7 +16,13 @@
- 	add_definitions(-DHAVE_INTTYPES_H=1)
- endif(INTTYPES_INCLUDE_DIR)
- 
--set(DATADIR share/vavoom)
-+IF(NOT DEFINED DATADIR)
-+	set(DATADIR share/vavoom)
-+ENDIF(NOT DEFINED DATADIR)
-+
-+IF(NOT DEFINED BINDIR)
-+	set(BINDIR bin)
-+ENDIF(NOT DEFINED BINDIR)
- 
- add_subdirectory(utils)
- add_subdirectory(source)
---- source/CMakeLists.txt	2008-01-31 22:34:28.000000000 +0100
-+++ source/CMakeLists.txt	2008-01-31 23:00:17.000000000 +0100
+--- source/CMakeLists.txt	2008-02-02 15:06:06.000000000 +0100
++++ source/CMakeLists.txt	2008-02-02 15:26:12.000000000 +0100
 @@ -845,8 +845,6 @@
  
  add_executable(vavoom ${MAIN_SOURCES})
@@ -26,12 +9,10 @@
  set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom)
  endif(UNIX)
  if (MAIN_COMPILE_FLAGS)
-@@ -855,21 +853,7 @@
- target_link_libraries(vavoom ${MAIN_LIBS})
- add_dependencies(vavoom timidity glbsp libglvis)
+@@ -857,20 +855,6 @@
+ 
+ install(TARGETS vavoom DESTINATION ${BINDIR})
  
--install(TARGETS vavoom DESTINATION bin)
--
 -install(FILES vavoom.png DESTINATION ${DATADIR})
 -
 -if(UNIX)
@@ -40,16 +21,16 @@
 -# Needed to make symlinks/shortcuts work.
 -# the binaries must run with correct working directory
 -cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
--\"${CMAKE_INSTALL_PREFIX}/bin/vavoom.i686\" $* ${IWADDIR}
+-\"${CMAKE_INSTALL_PREFIX}/${BINDIR}/vavoom.i686\" $* ${IWADDIR}
 -exit $?
 -")
--	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom DESTINATION bin)
+-	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom DESTINATION ${BINDIR})
 -endif(UNIX)
-+install(TARGETS vavoom DESTINATION ${BINDIR})
- 
+-
  endif(ENABLE_CLIENT)
  
-@@ -889,27 +873,13 @@
+ #---------------------------------------
+@@ -889,9 +873,7 @@
  
  add_executable(vavoom-dedicated ${SERVER_SOURCES})
  if(UNIX)
@@ -60,33 +41,22 @@
  endif(UNIX)
  set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
  target_link_libraries(vavoom-dedicated glbsp ${ZLIB_LIBRARY} ${NET_LIBRARIES})
- add_dependencies(vavoom-dedicated glbsp)
+@@ -899,18 +881,6 @@
+ 
+ install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
  
--install(TARGETS vavoom-dedicated DESTINATION bin)
--
 -if(UNIX)
 -	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated
 -"#!/bin/sh
 -# Needed to make symlinks/shortcuts work.
 -# the binaries must run with correct working directory
 -cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
--\"${CMAKE_INSTALL_PREFIX}/bin/vavoom-dedicated.i686\" $* ${IWADDIR}
+-\"${CMAKE_INSTALL_PREFIX}/${BINDIR}/vavoom-dedicated.i686\" $* ${IWADDIR}
 -exit $?
 -")
--	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated DESTINATION bin)
+-	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated DESTINATION ${BINDIR})
 -endif(UNIX)
-+install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
- 
+-
  endif(ENABLE_SERVER)
  
---- utils/vlaunch/CMakeLists.txt	2008-01-31 22:53:37.000000000 +0100
-+++ utils/vlaunch/CMakeLists.txt	2008-01-31 22:53:56.000000000 +0100
-@@ -9,7 +9,7 @@
- 	)
- 	target_link_libraries(vlaunch ${wxWidgets_LIBRARIES})
- 
--	install(TARGETS vlaunch DESTINATION bin)
-+	install(TARGETS vlaunch DESTINATION ${BINDIR})
- 
- #EXTRA_DIST = \
- #	vavoom.xpm \
+ # # ---------------------------------------
diff --git a/games-fps/vavoom/vavoom-1.26.ebuild b/games-fps/vavoom/vavoom-1.26.ebuild
index 5bd9ed347..e9ce3e09a 100644
--- a/games-fps/vavoom/vavoom-1.26.ebuild
+++ b/games-fps/vavoom/vavoom-1.26.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WX_GTK_VER="2.6"
+
 inherit autotools eutils flag-o-matic wxwidgets games
 
 DESCRIPTION="Advanced source port for Doom/Heretic/Hexen/Strife"
@@ -13,7 +16,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 wxwindows"
+openal opengl +sdl textures tools wxwindows"
 
 QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
 
diff --git a/games-fps/vavoom/vavoom-9999.ebuild b/games-fps/vavoom/vavoom-9999.ebuild
index 8d6be1420..8d45a4806 100644
--- a/games-fps/vavoom/vavoom-9999.ebuild
+++ b/games-fps/vavoom/vavoom-9999.ebuild
@@ -2,7 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI="1"
+
 WX_GTK_VER="2.8"
+
 inherit cmake-utils eutils subversion wxwidgets games
 
 DESCRIPTION="Advanced source port for Doom/Heretic/Hexen/Strife"
@@ -12,8 +15,7 @@ ESVN_REPO_URI="https://vavoom.svn.sourceforge.net/svnroot/vavoom/trunk/vavoom"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="allegro asm debug dedicated flac mad mikmod models music openal opengl
-sdl textures tools vorbis wxwindows"
+IUSE="allegro asm debug dedicated flac mad mikmod models music openal opengl +sdl textures tools vorbis wxwindows"
 
 QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
 
@@ -52,7 +54,7 @@ PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
 	music? ( games-fps/vavoom-music )
 	textures? ( games-fps/vavoom-textures )"
 
-dir=${GAMES_DATADIR}/${PN}
+datadir=${GAMES_DATADIR}/${PN}
 
 pkg_setup() {
 	games_pkg_setup
@@ -109,13 +111,12 @@ src_unpack() {
 
 	# Patch CMakelists.txt to
 	# - get rid of executable wrappers
-	# - permit custom {bin,dat}dir
 	# - set custom binary names
 	epatch "${FILESDIR}/${PN}_cmake_build.patch"
 
-	# Set shared directory
+	# Set shared data directory
 	sed -i \
-		-e "s:fl_basedir = \".\":fl_basedir = \"${dir}\":" \
+		-e "s:fl_basedir = \".\":fl_basedir = \"${datadir}\":" \
 		source/files.cpp || die "sed files.cpp failed"
 }
 
@@ -194,11 +195,11 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	elog "Copy or link wad files into ${dir}"
+	elog "Copy or link wad files into ${datadir}"
 	elog "(the files must be readable by the 'games' group)."
 	elog
 	elog "Example setup:"
-	elog "ln -sn ${GAMES_DATADIR}/doom-data/doom.wad ${dir}/"
+	elog "ln -sn ${GAMES_DATADIR}/doom-data/doom.wad ${datadir}/"
 	elog
 	elog "Example command-line:"
 	elog "   vavoom -doom -opengl"