summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Cendron <scen@gentoo.org>2009-04-07 21:56:28 +0000
committerDavide Cendron <scen@gentoo.org>2009-04-07 21:56:28 +0000
commit555ac5b9f3cfd95fec46fb1a5b29db25fcbf8439 (patch)
tree016924bfb4cb25532917beaef3958009114f5c1a /games-fps
parentgames-fps/vavoom: Version bump. Also forced enabling of some USE, to improve ... (diff)
downloadsunrise-555ac5b9f3cfd95fec46fb1a5b29db25fcbf8439.tar.gz
sunrise-555ac5b9f3cfd95fec46fb1a5b29db25fcbf8439.tar.bz2
sunrise-555ac5b9f3cfd95fec46fb1a5b29db25fcbf8439.zip
games-fps/vavoom: Sync live ebuild contents including latest changes in other one
svn path=/sunrise/; revision=8217
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/vavoom/ChangeLog3
-rw-r--r--games-fps/vavoom/Manifest4
-rw-r--r--games-fps/vavoom/vavoom-9999.ebuild62
3 files changed, 19 insertions, 50 deletions
diff --git a/games-fps/vavoom/ChangeLog b/games-fps/vavoom/ChangeLog
index b47eeae29..ca18d35f9 100644
--- a/games-fps/vavoom/ChangeLog
+++ b/games-fps/vavoom/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Apr 2009; Davide Cendron (scen) <scen@gentoo.org> vavoom-9999.ebuild:
+ Sync live ebuild contents including latest changes in other one
+
07 Apr 2009; Davide Cendron (scen) <scen@gentoo.org> -vavoom-1.29.ebuild,
+vavoom-1.30.ebuild:
Version bump. Also forced enabling of some USE, to improve the default
diff --git a/games-fps/vavoom/Manifest b/games-fps/vavoom/Manifest
index 93973bba2..c19bdbc91 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 5646 RMD160 01785e6daa76d2277565c28f86fce62b529cff12 SHA1 340e9650e6758c4e4940b2741725da6b25251247 SHA256 300987138d542d2eee8388b1ff7a70c9c07d76f5f5e83d22b68ef911a3903db3
-EBUILD vavoom-9999.ebuild 6496 RMD160 2e02d0ef61945bdd26bad52eef9a53c2fc418fcc SHA1 b3b40d197bff0be9746fe977d6572c017d5e6184 SHA256 a41ed8ee13d14c56bf602d1d8bcbe9e2b45ede5d00cd206b845ca3ce3ae750d2
-MISC ChangeLog 5328 RMD160 569bcc70fe45fd60e529d76417508b7fa2f3b456 SHA1 10570dbc0bec29e71541e2bbec8ec616b386a401 SHA256 b5316d7ea725bf216ba899014a15b6f08a83831ba1f41fe1e15fe76e82f95caf
+EBUILD vavoom-9999.ebuild 5696 RMD160 2b3180f957baa442680eab116ce284637e3c5515 SHA1 14a298464009d1aa39d86849dc02c5896fd172b9 SHA256 0c5493a0ede9146a15c6a5bcc79fff9ae05f35fe27d51ef2c1d70473432e0fc8
+MISC ChangeLog 5470 RMD160 2ac83e7970221923a0b5aa1d2f66a8f7c6e5b520 SHA1 408290db2a026149d16d33db1f7551ddcbae6eff SHA256 ad2f89a48dd98422e8309aabfb91046ed3a65dc41670f2007e9ee7767bc34017
MISC metadata.xml 771 RMD160 050ac292fec8946885040d86929ebf03deb68948 SHA1 90f3304a6dc3807267d12430b9341e07fff61825 SHA256 ac5674aa9dd92f3ccb428dc78a1245cfa1c3b8d95c237e7848e9f601e57bf7da
diff --git a/games-fps/vavoom/vavoom-9999.ebuild b/games-fps/vavoom/vavoom-9999.ebuild
index 2c34e4c2f..f1e51a476 100644
--- a/games-fps/vavoom/vavoom-9999.ebuild
+++ b/games-fps/vavoom/vavoom-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="1"
+EAPI="2"
WX_GTK_VER="2.8"
@@ -15,10 +15,8 @@ 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"
-
-QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
+IUSE="allegro asm debug dedicated flac mad mikmod +models +music openal +opengl
++sdl +textures tools +vorbis wxwindows"
# From econf: "Vavoom requires Allegro or SDL to compile"
# SDL,like Allegro are *software* renderers in this game.
@@ -29,9 +27,9 @@ QA_EXECSTACK="${GAMES_BINDIR:1}/${PN}"
# (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"
+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/allegrogl )
@@ -47,19 +45,21 @@ DEPEND="media-libs/libpng
mad? ( media-libs/libmad )
mikmod? ( media-libs/libmikmod )
openal? ( media-libs/openal )
- wxwindows? ( =x11-libs/wxGTK-2.8* )"
+ wxwindows? ( x11-libs/wxGTK:2.8 )"
RDEPEND="${DEPEND}
allegro? ( media-sound/timidity++ )"
-PDEPEND="models? ( >=games-fps/vavoom-models-1.4.2 )
+PDEPEND="models? ( >=games-fps/vavoom-models-1.4.3 )
music? ( games-fps/vavoom-music )
textures? ( games-fps/vavoom-textures )"
datadir=${GAMES_DATADIR}/${PN}
+CMAKE_IN_SOURCE_BUILD=true
+
pkg_setup() {
games_pkg_setup
- # Do some important check ...
+ # Print some warning if needed
if use sdl && use allegro ; then
echo
ewarn "Both 'allegro' and 'sdl' USE flags enabled. Using SDL as default."
@@ -68,41 +68,7 @@ pkg_setup() {
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!"
+ ! use opengl && ewarn "'opengl' USE flag disabled. OpenGL is recommended, for best graphics."
}
src_unpack() {
@@ -161,7 +127,7 @@ src_compile() {
$(cmake-utils_use_enable wxwindows LAUNCHER)
-DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG}"
- cmake-utils_src_configurein
+ cmake-utils_src_configure
cmake-utils_src_make -j1
}