From fc2cd7678587178f00895e835fd173d5c1c548d2 Mon Sep 17 00:00:00 2001
From: Davide Cendron <scen@gentoo.org>
Date: Wed, 18 Jun 2008 22:21:57 +0000
Subject: games-fps/vavoom: Version bump

svn path=/sunrise/; revision=6343
---
 games-fps/vavoom/ChangeLog            |   4 +
 games-fps/vavoom/Manifest             |   6 +-
 games-fps/vavoom/vavoom-1.27.1.ebuild | 233 ----------------------------------
 games-fps/vavoom/vavoom-1.28.ebuild   | 233 ++++++++++++++++++++++++++++++++++
 4 files changed, 240 insertions(+), 236 deletions(-)
 delete mode 100644 games-fps/vavoom/vavoom-1.27.1.ebuild
 create mode 100644 games-fps/vavoom/vavoom-1.28.ebuild

diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog
index c903a11c1..f12f54ac6 100644
--- a/games-fps/vavoom/ChangeLog
+++ b/games-fps/vavoom/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  18 Jun 2008; Davide Cendron (scen) <scen@gentoo.org>
+  -vavoom-1.27.1.ebuild, +vavoom-1.28.ebuild:
+  Version bump
+
   15 Apr 2008; Davide Cendron (scen) <scen@gentoo.org> -vavoom-1.27.ebuild,
   +vavoom-1.27.1.ebuild:
   Version bump
diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest
index f4282fb1e..1ad65c375 100644
--- a/games-fps/vavoom/Manifest
+++ b/games-fps/vavoom/Manifest
@@ -1,5 +1,5 @@
-DIST vavoom-1.27.1.tar.bz2 1569598 RMD160 ded524da97f6decc5383755c022f1ab7cd0089a3 SHA1 b0c340e801c0a7283fe2172f3a285f543c44a2bd SHA256 33d3a3012927690a921ca52388850cb007e4a166623cfdb8dc2badddbaad8e54
-EBUILD vavoom-1.27.1.ebuild 6446 RMD160 e00e1cda574491aaf0d5a4d19394202c71a50d3b SHA1 df7e705c55d5c3998f33952d18ca97a5fdc798d5 SHA256 7b2c7edfd0aa22dda4a0ba0d4b1e8614899999c869ef0164714abc84fc534258
+DIST vavoom-1.28.tar.bz2 1608334 RMD160 f40523e1ad52dfdee81ddbda870af41a237e1ba9 SHA1 64a1449d6d49e3fdd7732203f4475eeeb1bb4112 SHA256 3553393f20d2da0d2a2ba23008f56b10aee12b8034d71dcc53cce9bc40ae1172
+EBUILD vavoom-1.28.ebuild 6446 RMD160 e00e1cda574491aaf0d5a4d19394202c71a50d3b SHA1 df7e705c55d5c3998f33952d18ca97a5fdc798d5 SHA256 7b2c7edfd0aa22dda4a0ba0d4b1e8614899999c869ef0164714abc84fc534258
 EBUILD vavoom-9999.ebuild 6496 RMD160 2e02d0ef61945bdd26bad52eef9a53c2fc418fcc SHA1 b3b40d197bff0be9746fe977d6572c017d5e6184 SHA256 a41ed8ee13d14c56bf602d1d8bcbe9e2b45ede5d00cd206b845ca3ce3ae750d2
-MISC ChangeLog 4707 RMD160 d53bc3b733095094acd8c00eaf3a6da6cc53961a SHA1 4657966861149ea100f58aada5779e429bddd93e SHA256 a6c5d95848b99831632bc585b26a0c05f6b7090c7947d32b0f61874b2b5ddbeb
+MISC ChangeLog 4824 RMD160 7dfbc7c77a1ff310a67cc7387e75506cf46c7484 SHA1 3454b677705da56d34edd9d9bef06bcab814e6f7 SHA256 1a7cf89c65d28caf7918708735ed48bed8e50694586a10e5f952961c57fe589e
 MISC metadata.xml 303 RMD160 626272995441b20fd23b1d0a94603e98b97b0f1e SHA1 f3cae1ec3568e7717d7265a58d0b2e6d8efe88b5 SHA256 334d9b64af3b010a9fcdcbd8736eba2f81ff9d87dee3eb76b5adacb7d48afa37
diff --git a/games-fps/vavoom/vavoom-1.27.1.ebuild b/games-fps/vavoom/vavoom-1.27.1.ebuild
deleted file mode 100644
index c7d595108..000000000
--- a/games-fps/vavoom/vavoom-1.27.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="1"
-
-WX_GTK_VER="2.8"
-
-inherit cmake-utils eutils wxwidgets games
-
-DESCRIPTION="Advanced source port for Doom/Heretic/Hexen/Strife"
-HOMEPAGE="http://www.vavoom-engine.com/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-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"
-
-QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
-
-# From econf:  "Vavoom requires Allegro or SDL to compile"
-# SDL,like Allegro are *software* renderers in this game.
-# So, if not selected through proper USEs, the default is SDL,
-# without opengl (vavoom can run in software-mode only).
-# To enable it, enable proper USE.
-# OpenGL is the normally-desired hardware renderer, selected on command-line
-# (through "-opengl" switch). This switch is also added to the desktop entry,
-# if "opengl" USE flag is enabled
-
-SDLDEPEND=">=media-libs/libsdl-1.2
-	media-libs/sdl-mixer"
-ALLEGDEPEND=">=media-libs/allegro-4.0"
-OPENGLDEPEND="opengl? ( virtual/opengl )
-	sdl? ( ${SDLDEPEND} )
-	allegro? ( media-libs/allegrogl )
-	!sdl? ( !allegro? ( ${SDLDEPEND} ) )"
-DEPEND="media-libs/libpng
-	media-libs/jpeg
-	sdl? ( ${SDLDEPEND} )
-	!sdl? ( allegro? ( ${ALLEGDEPEND} ) )
-	!sdl? ( !allegro? ( !dedicated? ( ${OPENGLDEPEND} ) ) )
-	opengl? ( ${OPENGLDEPEND} )
-	vorbis? ( media-libs/libvorbis )
-	flac? ( media-libs/flac )
-	mad? ( media-libs/libmad )
-	mikmod? ( media-libs/libmikmod )
-	openal? ( media-libs/openal )
-	wxwindows? ( =x11-libs/wxGTK-2.8* )"
-RDEPEND="${DEPEND}
-	allegro? ( media-sound/timidity++ )"
-PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
-	music? ( games-fps/vavoom-music )
-	textures? ( games-fps/vavoom-textures )"
-
-datadir=${GAMES_DATADIR}/${PN}
-
-pkg_setup() {
-	games_pkg_setup
-
-	# Do some important check ...
-	if use sdl && use allegro ; then
-		echo
-		ewarn "Both 'allegro' and 'sdl' USE flags enabled. Using SDL as default."
-	elif ! use sdl && ! use allegro ; then
-		echo
-		ewarn "Both 'allegro' and 'sdl' USE flags disabled. Using SDL as default."
-	fi
-
-	# Base graphic/sound/music support is enabled?
-	echo
-	einfo "Doing some sanity check..."
-
-	# Graphic/sound/opengl check
-	local backend="media-libs/libsdl"
-
-	if ! use sdl && use allegro ; then
-		backend="media-libs/allegro"
-	fi
-
-	local backendflags="X alsa"
-
-	if use opengl ; then
-		[[ "${backend}" == "media-libs/libsdl" ]] && backendflags="${backendflags} opengl"
-	else
-		ewarn "'opengl' USE flag disabled. OpenGL is recommended, for best graphics."
-	fi
-
-	local msg="Please rebuild ${backend} with ${backendflags} USE flag enabled"
-	if ! built_with_use ${backend} ${backendflags} ; then
-			eerror "${msg}"
-			die ${msg}
-	fi
-
-	# Music check
-	if ! use allegro && ! built_with_use media-libs/sdl-mixer timidity ; then
-		echo
-		eerror "MIDI Music support is not configured properly!"
-		eerror "Please rebuild sdl-mixer with USE 'timidity' enabled!"
-		die "music support error"
-	fi
-
-	echo
-	einfo "All is OK, let's build!"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Got rid of icon installation
-	sed -i \
-		-e "/vavoom\.png/d" \
-		source/CMakeLists.txt || die "sed CMakeLists.txt failed"
-
-	# Set shared data directory
-	sed -i \
-		-e "s:fl_basedir = \".\":fl_basedir = \"${datadir}\":" \
-		source/files.cpp || die "sed files.cpp failed"
-}
-
-src_compile() {
-	local \
-		with_allegro="-DWITH_ALLEGRO=OFF" \
-		with_sdl="-DWITH_SDL=OFF" \
-		with_vorbis=$(cmake-utils_use_with vorbis)
-
-	# Sdl is the default, unless sdl=off & allegro=on
-	if ! use sdl && use allegro ; then
-		with_allegro="-DWITH_ALLEGRO=ON"
-	else
-		with_sdl="-DWITH_SDL=ON"
-	fi
-
-	# Forcibly enable vorbis support if "music" USE flag is enabled
-	if ! use vorbis && use music ; then
-		ewarn "\"music\" USE flag requires Vorbis support enabled."
-		ewarn "Forced enabling of \"vorbis\" USE flag"
-		with_vorbis="-DWITH_VORBIS=ON"
-	fi
-
-	mycmakeargs="${mycmakeargs}
-					-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
-					-DCMAKE_CXX_FLAGS_DEBUG=-g2
-					-DDATADIR=${datadir}
-					-DBINDIR="${GAMES_BINDIR}"
-					-DENABLE_CLIENT=ON
-					-DENABLE_WRAPPERS=OFF
-					${with_allegro}
-					${with_sdl}
-					${with_vorbis}
-					$(cmake-utils_use_with opengl OPENGL)
-					$(cmake-utils_use_with openal OPENAL)
-					$(cmake-utils_use_with mad LIBMAD)
-					$(cmake-utils_use_with mikmod MIKMOD)
-					$(cmake-utils_use_with flac FLAC)
-					$(cmake-utils_use_enable debug ZONE_DEBUG)
-					$(cmake-utils_use_enable dedicated SERVER)
-					$(cmake-utils_use_enable asm ASM)
-					$(cmake-utils_use_enable wxwindows LAUNCHER)
-					-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}"
-
-	cmake-utils_src_configurein
-
-	cmake-utils_src_make -j1
-}
-
-src_install() {
-	local de_cmd="${PN}"
-
-	cmake-utils_src_install
-
-	# 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
-		# The tools are always built
-		dogamesbin 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 shortcut
-		doicon utils/vlaunch/vlaunch.xpm || die "doicon vlaunch.xpm failed"
-		make_desktop_entry "vlaunch" "Vavoom Launcher" "vlaunch.xpm"
-	fi
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	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 "${datadir}"/"
-	elog
-	elog "Example command-line:"
-	elog "   vavoom -doom -opengl"
-	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"
-		elog "(useful for mod developing):"
-		elog
-		elog " - acc (ACS Script Compiler)"
-		elog " - fixmd2 (MD2 models utility)"
-		elog " - vcc (Vavoom C Compiler)"
-		elog " - vlumpy (Vavoom Lump utility)"
-		elog
-		elog "See the Vavoom Wiki at http://vavoom-engine.com/wiki/ or"
-		elog "Vavoom Forum at http://www.vavoom-engine.com/forums/"
-		elog "for further help."
-	fi
-}
diff --git a/games-fps/vavoom/vavoom-1.28.ebuild b/games-fps/vavoom/vavoom-1.28.ebuild
new file mode 100644
index 000000000..c7d595108
--- /dev/null
+++ b/games-fps/vavoom/vavoom-1.28.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils eutils wxwidgets games
+
+DESCRIPTION="Advanced source port for Doom/Heretic/Hexen/Strife"
+HOMEPAGE="http://www.vavoom-engine.com/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+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"
+
+QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
+
+# From econf:  "Vavoom requires Allegro or SDL to compile"
+# SDL,like Allegro are *software* renderers in this game.
+# So, if not selected through proper USEs, the default is SDL,
+# without opengl (vavoom can run in software-mode only).
+# To enable it, enable proper USE.
+# OpenGL is the normally-desired hardware renderer, selected on command-line
+# (through "-opengl" switch). This switch is also added to the desktop entry,
+# if "opengl" USE flag is enabled
+
+SDLDEPEND=">=media-libs/libsdl-1.2
+	media-libs/sdl-mixer"
+ALLEGDEPEND=">=media-libs/allegro-4.0"
+OPENGLDEPEND="opengl? ( virtual/opengl )
+	sdl? ( ${SDLDEPEND} )
+	allegro? ( media-libs/allegrogl )
+	!sdl? ( !allegro? ( ${SDLDEPEND} ) )"
+DEPEND="media-libs/libpng
+	media-libs/jpeg
+	sdl? ( ${SDLDEPEND} )
+	!sdl? ( allegro? ( ${ALLEGDEPEND} ) )
+	!sdl? ( !allegro? ( !dedicated? ( ${OPENGLDEPEND} ) ) )
+	opengl? ( ${OPENGLDEPEND} )
+	vorbis? ( media-libs/libvorbis )
+	flac? ( media-libs/flac )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	openal? ( media-libs/openal )
+	wxwindows? ( =x11-libs/wxGTK-2.8* )"
+RDEPEND="${DEPEND}
+	allegro? ( media-sound/timidity++ )"
+PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
+	music? ( games-fps/vavoom-music )
+	textures? ( games-fps/vavoom-textures )"
+
+datadir=${GAMES_DATADIR}/${PN}
+
+pkg_setup() {
+	games_pkg_setup
+
+	# Do some important check ...
+	if use sdl && use allegro ; then
+		echo
+		ewarn "Both 'allegro' and 'sdl' USE flags enabled. Using SDL as default."
+	elif ! use sdl && ! use allegro ; then
+		echo
+		ewarn "Both 'allegro' and 'sdl' USE flags disabled. Using SDL as default."
+	fi
+
+	# Base graphic/sound/music support is enabled?
+	echo
+	einfo "Doing some sanity check..."
+
+	# Graphic/sound/opengl check
+	local backend="media-libs/libsdl"
+
+	if ! use sdl && use allegro ; then
+		backend="media-libs/allegro"
+	fi
+
+	local backendflags="X alsa"
+
+	if use opengl ; then
+		[[ "${backend}" == "media-libs/libsdl" ]] && backendflags="${backendflags} opengl"
+	else
+		ewarn "'opengl' USE flag disabled. OpenGL is recommended, for best graphics."
+	fi
+
+	local msg="Please rebuild ${backend} with ${backendflags} USE flag enabled"
+	if ! built_with_use ${backend} ${backendflags} ; then
+			eerror "${msg}"
+			die ${msg}
+	fi
+
+	# Music check
+	if ! use allegro && ! built_with_use media-libs/sdl-mixer timidity ; then
+		echo
+		eerror "MIDI Music support is not configured properly!"
+		eerror "Please rebuild sdl-mixer with USE 'timidity' enabled!"
+		die "music support error"
+	fi
+
+	echo
+	einfo "All is OK, let's build!"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Got rid of icon installation
+	sed -i \
+		-e "/vavoom\.png/d" \
+		source/CMakeLists.txt || die "sed CMakeLists.txt failed"
+
+	# Set shared data directory
+	sed -i \
+		-e "s:fl_basedir = \".\":fl_basedir = \"${datadir}\":" \
+		source/files.cpp || die "sed files.cpp failed"
+}
+
+src_compile() {
+	local \
+		with_allegro="-DWITH_ALLEGRO=OFF" \
+		with_sdl="-DWITH_SDL=OFF" \
+		with_vorbis=$(cmake-utils_use_with vorbis)
+
+	# Sdl is the default, unless sdl=off & allegro=on
+	if ! use sdl && use allegro ; then
+		with_allegro="-DWITH_ALLEGRO=ON"
+	else
+		with_sdl="-DWITH_SDL=ON"
+	fi
+
+	# Forcibly enable vorbis support if "music" USE flag is enabled
+	if ! use vorbis && use music ; then
+		ewarn "\"music\" USE flag requires Vorbis support enabled."
+		ewarn "Forced enabling of \"vorbis\" USE flag"
+		with_vorbis="-DWITH_VORBIS=ON"
+	fi
+
+	mycmakeargs="${mycmakeargs}
+					-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
+					-DCMAKE_CXX_FLAGS_DEBUG=-g2
+					-DDATADIR=${datadir}
+					-DBINDIR="${GAMES_BINDIR}"
+					-DENABLE_CLIENT=ON
+					-DENABLE_WRAPPERS=OFF
+					${with_allegro}
+					${with_sdl}
+					${with_vorbis}
+					$(cmake-utils_use_with opengl OPENGL)
+					$(cmake-utils_use_with openal OPENAL)
+					$(cmake-utils_use_with mad LIBMAD)
+					$(cmake-utils_use_with mikmod MIKMOD)
+					$(cmake-utils_use_with flac FLAC)
+					$(cmake-utils_use_enable debug ZONE_DEBUG)
+					$(cmake-utils_use_enable dedicated SERVER)
+					$(cmake-utils_use_enable asm ASM)
+					$(cmake-utils_use_enable wxwindows LAUNCHER)
+					-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}"
+
+	cmake-utils_src_configurein
+
+	cmake-utils_src_make -j1
+}
+
+src_install() {
+	local de_cmd="${PN}"
+
+	cmake-utils_src_install
+
+	# 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
+		# The tools are always built
+		dogamesbin 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 shortcut
+		doicon utils/vlaunch/vlaunch.xpm || die "doicon vlaunch.xpm failed"
+		make_desktop_entry "vlaunch" "Vavoom Launcher" "vlaunch.xpm"
+	fi
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	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 "${datadir}"/"
+	elog
+	elog "Example command-line:"
+	elog "   vavoom -doom -opengl"
+	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"
+		elog "(useful for mod developing):"
+		elog
+		elog " - acc (ACS Script Compiler)"
+		elog " - fixmd2 (MD2 models utility)"
+		elog " - vcc (Vavoom C Compiler)"
+		elog " - vlumpy (Vavoom Lump utility)"
+		elog
+		elog "See the Vavoom Wiki at http://vavoom-engine.com/wiki/ or"
+		elog "Vavoom Forum at http://www.vavoom-engine.com/forums/"
+		elog "for further help."
+	fi
+}
-- 
cgit v1.2.3-65-gdbad