From 4bdc9dc0d12cf297d2a3afb4fb793bbb51a30c93 Mon Sep 17 00:00:00 2001 From: Jakub Moc Date: Sat, 13 Oct 2007 15:43:24 +0000 Subject: Same fixed for live SVN version svn path=/sunrise/; revision=4758 --- games-fps/vavoom/ChangeLog | 3 +- games-fps/vavoom/Manifest | 4 +- games-fps/vavoom/vavoom-9999.ebuild | 73 ++++++++++++------------------------- 3 files changed, 27 insertions(+), 53 deletions(-) (limited to 'games-fps/vavoom') diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog index fa2d48fd8..25944aa76 100644 --- a/games-fps/vavoom/ChangeLog +++ b/games-fps/vavoom/ChangeLog @@ -2,7 +2,8 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ - 13 Oct 2007; Jakub Moc vavoom-1.25.ebuild: + 13 Oct 2007; Jakub Moc vavoom-1.25.ebuild, + vavoom-9999.ebuild: Sanitize built_with_use checks so that we do not die too many times. Remove redundant vorbis USE flag as well. diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest index 6c5057112..7367699bf 100644 --- a/games-fps/vavoom/Manifest +++ b/games-fps/vavoom/Manifest @@ -1,6 +1,6 @@ AUX vavoom-makefile_nowrapper.patch 3235 RMD160 b04e87de8068e2d290387998d34701e2a3a58b30 SHA1 5e5f3b0da0c9ca975cb9606e5684bb5e21e3d7de SHA256 23266e9e536cafb766155d6b6899f358d7dd0489ce61e2b9bec9ec567d0ac7d9 DIST vavoom-1.25.tar.bz2 1731228 RMD160 fd974a5fabec6501b4683784367f2f616373c55d SHA1 d0ef203ef614318ed6ac0040f8da5d76cf8770d4 SHA256 bba1ac08ff82ca77da684af049ac68fa16dbb099755e41372b82ec6817b140ba EBUILD vavoom-1.25.ebuild 6386 RMD160 b1e2ac093a462730248a579058eb84982a34075c SHA1 064bf104a55dd144bd48df3879dda6682fa18231 SHA256 0be8da672f77d8cd2efda29541131e0c26f21609e66e7bcd55887f1dd6f02b04 -EBUILD vavoom-9999.ebuild 7259 RMD160 6a890fb7a22767f5e20017f2fcdb6debd29f38fc SHA1 40a8d10cb70374dc3162883cf35825a49aacef5d SHA256 17fb318724357d0fba3132030ef9888b3ed956c75ebdb389ab19d08a842ad384 -MISC ChangeLog 2725 RMD160 c7785ac9752c63e6da3da74aa4d739d4a08b6ad2 SHA1 2394168dedabe0f7e81f3e32f599bcb2188ebe68 SHA256 9f3a1adaa3c4c33dcafae9e33c51e9718c9bb94ad73d997845adef5e98b4740b +EBUILD vavoom-9999.ebuild 6449 RMD160 89e329bca2caea0f0802fc0f1b0a1e2fb67d96db SHA1 0e2a1b5e997f4cd311c387d0c5a4dad4a3db5a3c SHA256 bf0ad0fdd9bf02a8c5b13a76476551a804d66e7c86fd0655f5056bab1d6236e0 +MISC ChangeLog 2747 RMD160 119d15d39cb8b7f13a4f0b09e3ec225023885d20 SHA1 149fed5da0d67b3d8bbe3d5503bbbb0b48d982df SHA256 cccb2105decfd8dc76cb22b9deb2f70c75b09d4edd53e29b0120eddeab48dd43 MISC metadata.xml 303 RMD160 626272995441b20fd23b1d0a94603e98b97b0f1e SHA1 f3cae1ec3568e7717d7265a58d0b2e6d8efe88b5 SHA256 334d9b64af3b010a9fcdcbd8736eba2f81ff9d87dee3eb76b5adacb7d48afa37 diff --git a/games-fps/vavoom/vavoom-9999.ebuild b/games-fps/vavoom/vavoom-9999.ebuild index 7a3e4a379..5898f71fc 100644 --- a/games-fps/vavoom/vavoom-9999.ebuild +++ b/games-fps/vavoom/vavoom-9999.ebuild @@ -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 wxwindows" +openal opengl sdl textures tools wxwindows" QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}" @@ -38,7 +38,7 @@ DEPEND="media-libs/libpng !sdl? ( allegro? ( ${ALLEGDEPEND} ) ) !sdl? ( !allegro? ( !dedicated? ( ${OPENGLDEPEND} ) ) ) opengl? ( ${OPENGLDEPEND} ) - vorbis? ( media-libs/libvorbis ) + music? ( media-libs/libvorbis ) flac? ( media-libs/flac ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) @@ -54,73 +54,48 @@ PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 ) dir=${GAMES_DATADIR}/${PN} pkg_setup() { - local backend="media-libs/libsdl" - - if ! use sdl && use allegro ; then - backend="media-libs/allegro" - fi - games_pkg_setup # Do some important check ... - if use sdl && use allegro ; then echo - ewarn "Both 'allegro' and 'sdl' USE flags enabled" - ewarn "Set default to SDL" + ewarn "Both 'allegro' and 'sdl' USE flags enabled. Using SDL as default." elif ! use sdl && ! use allegro ; then - ewarn "Both 'sdl' and 'allegro' USE flags disabled" - ewarn "Set default to SDL" + 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 check - if ! built_with_use ${backend} X ; then - echo - eerror "Software Graphic support is not configured properly!" - eerror "Please rebuild ${backend} with 'X' USE flag enabled" - die "graphic support error" - fi + # Graphic/sound/opengl check + local backend="media-libs/libsdl" - # Sound check - if ! built_with_use ${backend} alsa ; then - echo - eerror "Sound support is not configured properly!" - eerror "Please rebuild ${backend} with 'alsa' USE flag enabled" - die "sound support error" + if ! use sdl && use allegro ; then + backend="media-libs/allegro" 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 + local backendflags="X alsa" - # OpenGL check if use opengl ; then - if [ "${backend}" == "media-libs/libsdl" ] && ! built_with_use ${backend} opengl ; then - echo - eerror "OpenGL support is not configured properly!" - eerror "Please rebuild ${backend} with 'opengl' USE flag enabled" - die "opengl support error" - fi + [[ "${backend}" == "media-libs/libsdl" ]] && backendflags="${backendflags} opengl" else - echo ewarn "'opengl' USE flag disabled. OpenGL is recommended, for best graphics." fi - # Does user want external music? Vorbis support is needed - if use music && ! use vorbis ; then + 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 "Ogg/Vorbis support is required for external music playing" - eerror "Please enable 'vorbis' USE flag for this package" - die "external music support error" + eerror "MIDI Music support is not configured properly!" + eerror "Please rebuild sdl-mixer with USE 'timidity' enabled!" + die "music support error" fi echo @@ -176,7 +151,7 @@ src_compile() { $(use_with opengl) \ $(use_with openal) \ $(use_with external-glbsp) \ - $(use_with vorbis) \ + $(use_with music vorbis) \ $(use_with mad libmad) \ $(use_with mikmod) \ $(use_with flac) \ @@ -191,8 +166,6 @@ src_compile() { --disable-maintainer-mode \ || die "egamesconf 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" } -- cgit v1.2.3-65-gdbad