summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2006-06-06 18:51:10 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2006-06-06 18:51:10 +0000
commitf74c86daa8d2141f1ec307aebd15d8c9e605cfc8 (patch)
tree33346efe0e4e2a3b391b1c3bca978e54c9248c00 /games-fps
parentMake USE="-alsa oss" work, thanks to Christophe PEREZ <chris@novazur.fr> in b... (diff)
downloadgentoo-2-f74c86daa8d2141f1ec307aebd15d8c9e605cfc8.tar.gz
gentoo-2-f74c86daa8d2141f1ec307aebd15d8c9e605cfc8.tar.bz2
gentoo-2-f74c86daa8d2141f1ec307aebd15d8c9e605cfc8.zip
Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit opengl providers for amd64 per bug #135643.
(Portage version: 2.1_rc3-r2)
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/quake4-demo/ChangeLog7
-rw-r--r--games-fps/quake4-demo/quake4-demo-1.0.ebuild42
2 files changed, 29 insertions, 20 deletions
diff --git a/games-fps/quake4-demo/ChangeLog b/games-fps/quake4-demo/ChangeLog
index 7b5285de4fd7..113c92359526 100644
--- a/games-fps/quake4-demo/ChangeLog
+++ b/games-fps/quake4-demo/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-fps/quake4-demo
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/ChangeLog,v 1.7 2006/03/31 21:12:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/ChangeLog,v 1.8 2006/06/06 18:51:10 wolf31o2 Exp $
+
+ 06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ quake4-demo-1.0.ebuild:
+ Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit
+ opengl providers for amd64 per bug #135643.
31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
quake4-demo-1.0.ebuild:
diff --git a/games-fps/quake4-demo/quake4-demo-1.0.ebuild b/games-fps/quake4-demo/quake4-demo-1.0.ebuild
index e6d26ac1243f..0c0bbfef0173 100644
--- a/games-fps/quake4-demo/quake4-demo-1.0.ebuild
+++ b/games-fps/quake4-demo/quake4-demo-1.0.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/quake4-demo/quake4-demo-1.0.ebuild,v 1.8 2006/03/31 21:12:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-demo/quake4-demo-1.0.ebuild,v 1.9 2006/06/06 18:51:10 wolf31o2 Exp $
inherit eutils games
@@ -20,26 +20,30 @@ KEYWORDS="-* amd64 x86"
IUSE="alsa opengl dedicated"
RESTRICT="strip"
-RDEPEND="sys-libs/glibc
- !amd64? (
- media-libs/libsdl )
+UIDEPEND="virtual/opengl
+ x86? (
+ || (
+ (
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp )
+ virtual/x11 ) )
+ media-libs/libsdl
amd64? (
app-emulation/emul-linux-x86-sdl
- app-emulation/emul-linux-x86-xlibs )
- opengl? (
- virtual/opengl
- x86? (
- || (
- (
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp )
- virtual/x11 ) ) )
- dedicated? (
- app-misc/screen )
- alsa? (
- >=media-libs/alsa-lib-1.0.6 )"
+ app-emulation/emul-linux-x86-xlibs
+ || (
+ >=app-emulation/emul-linux-x86-xlibs-7.0
+ >=media-video/nvidia-glx-1.0.6629-r3
+ >=x11-drivers/ati-drivers-8.8.25-r1 ) )
+ alsa? ( >=media-libs/alsa-lib-1.0.6 )"
+
+RDEPEND="sys-libs/glibc
+ dedicated? ( app-misc/screen )
+ amd64? ( app-emulation/emul-linux-x86-baselibs )
+ opengl? ( ${UIDEPEND} )
+ !dedicated? ( !opengl? ( ${UIDEPEND} ) )"
S=${WORKDIR}