[games-fps/vavoom] Bump #132055

3 files changed, 67 insertions, 83 deletions

diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog
index 641bb9937..44d0ae4e5 100644
--- a/games-fps/vavoom/ChangeLog
+++ b/games-fps/vavoom/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for games-fps/vavoom
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*vavoom-1.33 (18 Mar 2013)
+
+  18 Mar 2013; Patrick Lauer <patrick@gentoo.org> -vavoom-1.30.ebuild,
+  +vavoom-1.33.ebuild:
+  [games-fps/vavoom] Bump #132055
+
   30 Apr 2011; Justin Lecher <jlec@gentoo.org> vavoom-1.30.ebuild,
   vavoom-9999.ebuild:
   Moved media-libs/jpeg > virtual/jpeg
diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest
index bb6c5fd67..5b5579721 100644
--- a/games-fps/vavoom/Manifest
+++ b/games-fps/vavoom/Manifest
@@ -1,5 +1,5 @@
-DIST vavoom-1.30.tar.bz2 1597647 RMD160 0d5fbfdcfd74a06c444d7c32322c6567f5ffc5a4 SHA1 53135df66631eb3fd6efce618569916518eaa943 SHA256 a6bc1ffb7458e8050add65d7083d9cec0d64d4e475486be8cfa44dd6f5ea1ca4
-EBUILD vavoom-1.30.ebuild 5645 RMD160 b02a3321f465179bf5511a6cc59e99e563829e5a SHA1 75f16a28225d2d81964b5a715713da302986ae6f SHA256 dad3772d3d9c633a2807f358a82dbbdf5d8b118cd00d37f8c0dead18c8e76328
-EBUILD vavoom-9999.ebuild 5722 RMD160 f037d0b669e7ca644af34c3fca9b0b0d673ade49 SHA1 6fb3141643b6be4dfe54a44c7f17611e4ac3a5b4 SHA256 ac2fddff0ab3b38d9304ae19e1d98d1686ada66975c85169c4e438c6f516f044
-MISC ChangeLog 6215 RMD160 b5aff0daeb8f7370f0c34454506b402e2b199088 SHA1 440d8cd5720f9a30dceb4f611dc15cb3898ae5d3 SHA256 c0dad793f77fbd031cdec1a3aff53a58b4293a1d54e3ce225757d35498d6aaf5
-MISC metadata.xml 809 RMD160 b7bf9ace795c1e7dbf294ab78cb79ce28b7b410a SHA1 28a152fd3be45b835b13d97795a07819e4133aa7 SHA256 65a49d09843b07824fa6ac4f68aad78d484c58236039f37c988ea2536ee26766
+DIST vavoom-1.33.tar.bz2 1555267 SHA256 a57e19b51dc411ef3e659bfa62bd961d89a2f68ba0b76a1e89e18bae72b362df SHA512 43df722db80eff876c9818b5909aefaff46c1f79009c3c9c4c35ec603843550e29ba7df28cf4f8e0b68bc42242821d268b1efacbfc3d2e7b847f3710b1cafc74 WHIRLPOOL 20f88452ee46f5f3bdb8de181659d64436feb62ee7aa6086cb01b611970425966ebd158eb97104c4261e62327ab5ba0f47afe6c9aca6df48f5ec9b32792df21d
+EBUILD vavoom-1.33.ebuild 4758 SHA256 27fe37f671ad9a785f2ad2d7bce2a4be42d4a03652527865b42b278bb3cee042 SHA512 ef21c67c64674ff17b3f629152b783ac5191ddff2831b089329b0e1ab35bae462a4a9bff2a5f69b99589f0907418636aa1443967a2fde1dfe7343ae46bce23e0 WHIRLPOOL 88b3f9368102b123f6a8ba49fe2129f1551045fa8d277ae02c5f5b07a9a7d4276cbb8c6250bf4ac3a3a45abb043d966051e4f9e718b11e3f5a709a7f916b1575
+EBUILD vavoom-9999.ebuild 5722 SHA256 ac2fddff0ab3b38d9304ae19e1d98d1686ada66975c85169c4e438c6f516f044 SHA512 6ce6167a5e0df9a42d6b24a50deba0b072f2197635bbb1504252e6fc8fc5bd585c3dcbad887a421cd1330d34af4cbf721264f8f5cf32714ed11d767c286e6070 WHIRLPOOL fbdb62be93cdf8d25400d9e99a9d60e7c301ef365b199cb3c901233396473806594b3abcc7c1cf03a31555ef6c3871298762fdeb977a9b16c82017a9884430fb
+MISC ChangeLog 6372 SHA256 c9627eb26c055ed90c1d2601a12e2850110f06c838edb1b06ed0dd773d1b5f94 SHA512 ef93251b17435e30083a7b43cbfb403b629c8d72394bc0805e6b945d3a5b41c524b50dcdb55f0daf01b1eec2d2229abf28575d28e7c9528029f6c88dd4fb6d5b WHIRLPOOL 7f0af181a61b0ca09eb9b363d85253f26f7c641ce2f0da0dff5e473f91580516212449fc34f36cfa7551559e00478316779e499dc7eaa9d43f0ca655d8358a24
+MISC metadata.xml 809 SHA256 65a49d09843b07824fa6ac4f68aad78d484c58236039f37c988ea2536ee26766 SHA512 1db1ef0ea139e5e25101072117fb2d42502d1b54a73e85da3db65968bf1118611dcbaad47c0ed3339f9192eb68889124ee0a31e336f1ff78bec08d5e699563eb WHIRLPOOL 8527a38d200f0d9e676bc65d624a11a84c321b0460daa9816a5ae1de9905313f7bd75abb2e5229b22393331dee7cf6a0561249993d04eb9f95b610f567d96eca
diff --git a/games-fps/vavoom/vavoom-1.30.ebuild b/games-fps/vavoom/vavoom-1.33.ebuild
index 7266cbbcb..1b5c87058 100644
--- a/games-fps/vavoom/vavoom-1.30.ebuild
+++ b/games-fps/vavoom/vavoom-1.33.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="4"
 
 WX_GTK_VER="2.8"
 
@@ -15,31 +15,27 @@ 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 wxwidgets"
-
-# 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[X,alsa,opengl?]
-	media-libs/sdl-mixer[timidity]"
-ALLEGDEPEND=">=media-libs/allegro-4.0[X,alsa]"
-OPENGLDEPEND="opengl? ( virtual/opengl )
-	sdl? ( ${SDLDEPEND} )
-	allegro? ( media-libs/allegro[opengl] )
-	!sdl? ( !allegro? ( ${SDLDEPEND} ) )"
+IUSE="allegro asm debug dedicated flac mad mikmod models music openal +sdl textures tools vorbis wxwidgets"
+
+# Vavoom requires either Allegro or SDL to compile.
+# Set appropriate USE flags to select which library is used.
+
+# As of 1.33, OpenGL is required and thus forced on.
+
+SDLDEPEND="
+	|| ( >=media-libs/libsdl-1.2[alsa,X,opengl]
+		>=media-libs/libsdl-1.2[oss,X,opengl] )
+	music? ( media-libs/sdl-mixer )
+	!music? ( media-libs/sdl-mixer[timidity] )
+	"
+ALLEGDEPEND="
+	|| ( >=media-libs/allegro-4.0[alsa,X,opengl]
+		>=media-libs/allegro-4.0[oss,X,opengl] )
+	"
 DEPEND="media-libs/libpng
 	virtual/jpeg
 	sdl? ( ${SDLDEPEND} )
 	!sdl? ( allegro? ( ${ALLEGDEPEND} ) )
-	!sdl? ( !allegro? ( !dedicated? ( ${OPENGLDEPEND} ) ) )
-	opengl? ( ${OPENGLDEPEND} )
 	vorbis? ( media-libs/libvorbis )
 	flac? ( media-libs/flac )
 	mad? ( media-libs/libmad )
@@ -52,56 +48,42 @@ PDEPEND="models? ( >=games-fps/vavoom-models-1.4.3 )
 	music? ( games-fps/vavoom-music )
 	textures? ( games-fps/vavoom-textures )"
 
+REQUIRED_USE="^^ ( allegro sdl dedicated )
+	music? ( vorbis )"
+
 datadir=${GAMES_DATADIR}/${PN}
 
 CMAKE_IN_SOURCE_BUILD=true
 
 pkg_setup() {
 	games_pkg_setup
-
-	# Print some warning if needed
-	if use sdl && use allegro ; then
-		ewarn
-		ewarn "Both 'allegro' and 'sdl' USE flags enabled. Using SDL as default."
-	elif ! use sdl && ! use allegro ; then
-		ewarn
-		ewarn "Both 'allegro' and 'sdl' USE flags disabled. Using SDL as default."
-	fi
-
-	! use opengl && ewarn "'opengl' USE flag disabled. OpenGL is recommended, for best graphics."
 }
 
 src_prepare() {
 	# Got rid of icon installation
-	sed -i \
-		-e "/vavoom\.png/d" \
-		source/CMakeLists.txt || die "sed CMakeLists.txt failed"
+	sed -e "/vavoom\.png/d" \
+		-i 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"
+	sed -e "s:fl_basedir = \".\":fl_basedir = \"${datadir}\":" \
+		-i source/files.cpp || die "sed files.cpp failed"
+
+	# Fix zlib/minizip build error
+	sed -e '1i#define OF(x) x' \
+		-i "${S}/utils/vlumpy/ioapi.h" || die "sed iompi.h failed"
 }
 
 src_compile() {
 	local \
 		with_allegro="-DWITH_ALLEGRO=OFF" \
 		with_sdl="-DWITH_SDL=OFF" \
+		with_opengl="-DWITH_OPENGL=ON" \
 		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
+	use sdl && with_sdl="-DWITH_SDL=ON"
+	use allegro && with_allegro="-DWITH_ALLEGRO=ON"
+	use dedicated && with_opengl="-DWITH_OPENGL=OFF"
 
 	mycmakeargs="${mycmakeargs}
 					-DCMAKE_CXX_FLAGS_RELEASE=-DNDEBUG
@@ -112,8 +94,8 @@ src_compile() {
 					-DENABLE_WRAPPERS=OFF
 					${with_allegro}
 					${with_sdl}
+					${with_opengl}
 					${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)
@@ -130,14 +112,11 @@ src_compile() {
 }
 
 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"
+	# Create desktop entry
+	make_desktop_entry "${PN}" "Vavoom" || die "make_desktop_entry failed"
 	doicon "source/${PN}.png" || die "doicon ${PN}.png failed"
-	make_desktop_entry "${de_cmd}" "Vavoom"
 
 	dodoc "docs/${PN}.txt" || die "dodoc vavoom.txt failed"
 
@@ -166,31 +145,30 @@ pkg_postinst() {
 	elog "ln -sn "${GAMES_DATADIR}"/doom-data/doom.wad "${datadir}"/"
 	elog
 	elog "Example command-line:"
-	elog "   vavoom -doom -opengl"
+	elog "   vavoom -doom -openal"
 	elog
 	elog "See documentation for further details."
 
 	if use wxwidgets ; then
-		einfo
-		einfo "You've also installed a nice graphical launcher. Simply run:"
-		einfo
-		einfo "   vlaunch"
-		einfo
-		einfo "to enjoy it :)"
+		echo
+		elog "You've also installed a nice graphical launcher. Simply run:"
+		elog "   vlaunch"
+		elog
+		elog "to enjoy it :)"
 	fi
 
 	if use tools; then
-		einfo
-		einfo "You have also installed some Vavoom-related utilities"
-		einfo "(useful for mod developing):"
-		einfo
-		einfo " - acc (ACS Script Compiler)"
-		einfo " - fixmd2 (MD2 models utility)"
-		einfo " - vcc (Vavoom C Compiler)"
-		einfo " - vlumpy (Vavoom Lump utility)"
-		einfo
-		einfo "See the Vavoom Wiki at http://vavoom-engine.com/wiki/ or"
-		einfo "Vavoom Forum at http://www.vavoom-engine.com/forums/"
-		einfo "for further help."
+		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
 }