summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-06-27 19:53:04 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-06-27 19:53:04 +0000
commit6de4faba48cac08e314abf3b76aef6cbc0516252 (patch)
tree46ed236aed410f94b06f486374b402bd78b46c20 /games-fps/darkplaces
parentUpdated dependencies to be more accurate. (diff)
downloadgentoo-2-6de4faba48cac08e314abf3b76aef6cbc0516252.tar.gz
gentoo-2-6de4faba48cac08e314abf3b76aef6cbc0516252.tar.bz2
gentoo-2-6de4faba48cac08e314abf3b76aef6cbc0516252.zip
Sync dependencies with Nexuiz 2.0, since they're the same engine. Closing bug #137436.
(Portage version: 2.1.1_pre1-r2)
Diffstat (limited to 'games-fps/darkplaces')
-rw-r--r--games-fps/darkplaces/ChangeLog7
-rw-r--r--games-fps/darkplaces/darkplaces-20060616_beta1.ebuild42
2 files changed, 37 insertions, 12 deletions
diff --git a/games-fps/darkplaces/ChangeLog b/games-fps/darkplaces/ChangeLog
index 49e9a6ebe7d5..2ed9ca9052d0 100644
--- a/games-fps/darkplaces/ChangeLog
+++ b/games-fps/darkplaces/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-fps/darkplaces
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.1 2006/06/19 20:53:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/ChangeLog,v 1.2 2006/06/27 19:53:04 wolf31o2 Exp $
+
+ 27 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ darkplaces-20060616_beta1.ebuild:
+ Sync dependencies with Nexuiz 2.0, since they're the same engine. Closing
+ bug #137436.
*darkplaces-20060616_beta1 (19 Jun 2006)
diff --git a/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild b/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
index 69c8eb336745..cdb3f516f260 100644
--- a/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
+++ b/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild,v 1.1 2006/06/19 20:53:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/darkplaces/darkplaces-20060616_beta1.ebuild,v 1.2 2006/06/27 19:53:04 wolf31o2 Exp $
inherit eutils flag-o-matic versionator games
@@ -26,7 +26,14 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="alsa cdinstall cdsound dedicated demo dpmod lights opengl oss sdl textures"
-UIDEPEND="alsa? ( media-libs/alsa-lib )
+UIDEPEND="|| (
+ (
+ x11-proto/xextproto
+ x11-proto/xf86dgaproto
+ x11-proto/xf86vidmodeproto
+ x11-proto/xproto )
+ virtual/x11 )"
+UIRDEPEND="alsa? ( media-libs/alsa-lib )
media-libs/libogg
media-libs/libvorbis
|| (
@@ -35,19 +42,35 @@ UIDEPEND="alsa? ( media-libs/alsa-lib )
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXext
- x11-proto/xextproto
- x11-proto/xf86dgaproto
- x11-proto/xf86vidmodeproto
- x11-proto/xproto
x11-libs/libXxf86dga
x11-libs/libXxf86vm )
virtual/x11 )"
-RDEPEND="media-libs/jpeg
- cdinstall? ( games-fps/quake1-data )
+COMMON="media-libs/jpeg
+ sdl? (
+ media-libs/libsdl
+ ${UIDEPEND} )
+ opengl? (
+ virtual/opengl
+ ${UIDEPEND} )
+ !dedicated? ( !sdl? ( !opengl? ( virtual/opengl ${UIDEPEND} ) ) )"
+RDEPEND="cdinstall? ( games-fps/quake1-data )
demo? ( games-fps/quake1-demodata )
textures? ( >=games-fps/quake1-textures-20050820 )
sdl? (
media-libs/libsdl
+ ${UIRDEPEND} )
+ opengl? (
+ virtual/opengl
+ ${UIRDEPEND} )
+ !dedicated? ( !sdl? ( !opengl? ( virtual/opengl ${UIRDEPEND} ) ) )"
+DEPEND="dev-util/pkgconfig
+ app-arch/unzip
+ lights? (
+ || (
+ app-arch/unrar
+ app-arch/rar ) )
+ sdl? (
+ media-libs/libsdl
${UIDEPEND} )
opengl? (
virtual/opengl
@@ -57,9 +80,6 @@ RDEPEND="media-libs/jpeg
!opengl? (
virtual/opengl
${UIDEPEND} ) ) )"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- app-arch/unzip"
S=${WORKDIR}/${PN}
dir=${GAMES_DATADIR}/quake1