Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit opengl...

Package-Manager: portage-2.1_rc3-r2

diff --git a/games-fps/americas-army/ChangeLog b/games-fps/americas-army/ChangeLog
index 59f3ee1a7666ce484b7ed686bdc812fea7cefd4c..9749a2f14a9b90f30af7913d2c440ffbd1380cbd 100644 (file)
--- a/games-fps/americas-army/ChangeLog
+++ b/games-fps/americas-army/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/americas-army
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.46 2006/03/31 20:37:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/ChangeLog,v 1.47 2006/06/06 18:43:32 wolf31o2 Exp $
+
+  06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  americas-army-250.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>
   americas-army-250.ebuild:

diff --git a/games-fps/americas-army/americas-army-250.ebuild b/games-fps/americas-army/americas-army-250.ebuild
index 0c9eb4f52f1a85c187f2d6de7c259b4136fd8c1d..134a51ae863f2bae4c09b82d6db0405a433e0c2d 100644 (file)
--- a/games-fps/americas-army/americas-army-250.ebuild
+++ b/games-fps/americas-army/americas-army-250.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/americas-army/americas-army-250.ebuild,v 1.9 2006/03/31 20:37:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/americas-army/americas-army-250.ebuild,v 1.10 2006/06/06 18:43:32 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -29,6 +29,7 @@ RDEPEND="sys-libs/glibc
                amd64? (
                        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 ) )
                x86? (

diff --git a/games-fps/doom3-demo/ChangeLog b/games-fps/doom3-demo/ChangeLog
index 17568a20ccc5460e5d787e573030aae484934128..b86cd13ea2b6c376247372ff9e78fd117c2645c1 100644 (file)
--- a/games-fps/doom3-demo/ChangeLog
+++ b/games-fps/doom3-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3-demo
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.21 2006/05/22 18:09:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/ChangeLog,v 1.22 2006/06/06 18:45:47 wolf31o2 Exp $
+
+  06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-demo-1.1.1286.ebuild:
+  Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit
+  opengl providers for amd64 per bug #135643.
 
   22 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   doom3-demo-1.1.1286.ebuild:

diff --git a/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild b/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild
index 85b3958f0a9ca39d684c0b0aad8aa0c72f40df66..81393509ff8a1070f7dd3b8d8e055c0fe9215495 100644 (file)
--- a/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild
+++ b/games-fps/doom3-demo/doom3-demo-1.1.1286.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/doom3-demo/doom3-demo-1.1.1286.ebuild,v 1.14 2006/05/22 18:09:01 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3-demo/doom3-demo-1.1.1286.ebuild,v 1.15 2006/06/06 18:45:47 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://3dgamers/doom3/doom3-linux-${PV}-demo.x86.run
 
 LICENSE="DOOM3"
 SLOT="0"
-KEYWORDS="-* x86 amd64"
+KEYWORDS="-* amd64 x86"
 IUSE="opengl dedicated"
 RESTRICT="strip mirror"
 
@@ -24,7 +24,8 @@ DEPEND="app-arch/bzip2
 RDEPEND="virtual/libc
        opengl? ( virtual/opengl )
        amd64? ( app-emulation/emul-linux-x86-xlibs
-               || ( >=media-video/nvidia-glx-1.0.6629-r3
+               || ( >=app-emulation/emul-linux-x86-xlibs-7.0
+                       >=media-video/nvidia-glx-1.0.6629-r3
                        >=x11-drivers/ati-drivers-8.8.25-r1 ) )
        dedicated? ( app-misc/screen )"
 

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index 2d9433c24a123f59828ecedce9605a3e38101cc4..447f4c4cc58d6a54999fde8121fef41a1658e3fc 100644 (file)
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.25 2006/03/31 20:56:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.26 2006/06/06 18:55:17 wolf31o2 Exp $
+
+  06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-1.3.1302-r2.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>
   doom3-1.3.1302-r1.ebuild, doom3-1.3.1302-r2.ebuild:

diff --git a/games-fps/doom3/doom3-1.3.1302-r2.ebuild b/games-fps/doom3/doom3-1.3.1302-r2.ebuild
index 77a890db8658ed012bdf7a8a16d65e4c8ba4e2d1..b06d036ce92f1bd20f3c02a0c6698c8774d5ba51 100644 (file)
--- a/games-fps/doom3/doom3-1.3.1302-r2.ebuild
+++ b/games-fps/doom3/doom3-1.3.1302-r2.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/doom3/doom3-1.3.1302-r2.ebuild,v 1.2 2006/03/31 20:56:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302-r2.ebuild,v 1.3 2006/06/06 18:55:17 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -24,7 +24,11 @@ RDEPEND="sys-libs/glibc
        cdinstall? ( >=games-fps/doom3-data-1.1.1282-r1 )
        cdinstall? ( roe? ( games-fps/doom3-roe ) )
        amd64? ( app-emulation/emul-linux-x86-xlibs
-               app-emulation/emul-linux-x86-soundlibs )"
+               app-emulation/emul-linux-x86-soundlibs
+               || (
+                       >=app-emulation/emul-linux-x86-xlibs-7.0
+                       >=media-video/nvidia-glx-1.0.6629-r3
+                       >=x11-drivers/ati-drivers-8.8.25-r1 ) )"
 
 S=${WORKDIR}
 

diff --git a/games-fps/doom3/files/digest-doom3-1.3.1302-r1 b/games-fps/doom3/files/digest-doom3-1.3.1302-r1
index 244d9de7aeb1cf6377a468c24deb8e63e1cbc188..bec2a7905e96ed539d8972c39afe31709bd9cf3b 100644 (file)
--- a/games-fps/doom3/files/digest-doom3-1.3.1302-r1
+++ b/games-fps/doom3/files/digest-doom3-1.3.1302-r1
@@ -1,2 +1,6 @@
 MD5 b1d04da2d64bb8d54f64cbaa2fdb4490 doom3-linux-1.3.1302.x86.run 17199582
+RMD160 eccd25b0f9e1eb5810d981fdb3ffd7119d08e040 doom3-linux-1.3.1302.x86.run 17199582
+SHA256 da90ba338eadb298a736af8786c0d7b11be698a399ac7a20549de0926a434677 doom3-linux-1.3.1302.x86.run 17199582
 MD5 f99eb141eecc4b9dd188d6819d741546 doom3.png 6502
+RMD160 4d8a692621c9bbe6c85f0508ade4c35b06abb46f doom3.png 6502
+SHA256 c9a701498a7b0f923182bf9f11aac8d2193026e509ae3643a5bc118b1a458c6b doom3.png 6502

diff --git a/games-fps/postal2mp-demo/ChangeLog b/games-fps/postal2mp-demo/ChangeLog
index b3cfe19602db8752883ef4286b74b30760536a93..87871e5b8f4103745fe48a1647997973f7727135 100644 (file)
--- a/games-fps/postal2mp-demo/ChangeLog
+++ b/games-fps/postal2mp-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/postal2mpdemo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/ChangeLog,v 1.2 2006/04/13 21:03:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/ChangeLog,v 1.3 2006/06/06 18:47:43 wolf31o2 Exp $
+
+  06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  postal2mp-demo-1407.ebuild:
+  Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit
+  opengl providers for amd64 per bug #135643.
 
   13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   postal2mp-demo-1407.ebuild:

diff --git a/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild b/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
index 356d0da4501ca764872f7774ea232312d973f145..4446c391a3e08aaca840fbbb2a67958fac1bacc6 100644 (file)
--- a/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild
+++ b/games-fps/postal2mp-demo/postal2mp-demo-1407.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/postal2mp-demo/postal2mp-demo-1407.ebuild,v 1.2 2006/04/13 21:03:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/postal2mp-demo/postal2mp-demo-1407.ebuild,v 1.3 2006/06/06 18:47:43 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -19,7 +19,10 @@ RDEPEND="|| ( x11-libs/libXext
        amd64? (
                app-emulation/emul-linux-x86-baselibs
                app-emulation/emul-linux-x86-xlibs
-               >=media-video/nvidia-glx-1.0.6629-r3 )"
+               || (
+                       >=app-emulation/emul-linux-x86-xlibs-7.0
+                       >=media-video/nvidia-glx-1.0.6629-r3
+                       >=x11-drivers/ati-drivers-8.8.25-r1 ) )"
 
 S="${WORKDIR}"
 

diff --git a/games-fps/quake3-demo/ChangeLog b/games-fps/quake3-demo/ChangeLog
index 8538d70e00e505c8caf4a56462857d202742ad23..8222ae4ed0c80ee2f7d34cc5583f1ed70b19e68b 100644 (file)
--- a/games-fps/quake3-demo/ChangeLog
+++ b/games-fps/quake3-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake3-demo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.12 2006/04/13 21:10:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/ChangeLog,v 1.13 2006/06/06 18:53:17 wolf31o2 Exp $
+
+  06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake3-demo-1.11.ebuild:
+  Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit
+  opengl providers for amd64 per bug #135643.
 
   13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   quake3-demo-1.11.ebuild:

diff --git a/games-fps/quake3-demo/quake3-demo-1.11.ebuild b/games-fps/quake3-demo/quake3-demo-1.11.ebuild
index 5a9ff169de79016f1452562a34cf912f3225b639..0d2baa649ab4a74a4a2574adfb6231fa783ee227 100644 (file)
--- a/games-fps/quake3-demo/quake3-demo-1.11.ebuild
+++ b/games-fps/quake3-demo/quake3-demo-1.11.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/quake3-demo/quake3-demo-1.11.ebuild,v 1.14 2006/04/13 21:10:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake3-demo/quake3-demo-1.11.ebuild,v 1.15 2006/06/06 18:53:17 wolf31o2 Exp $
 
 inherit games
 
@@ -14,10 +14,27 @@ SLOT="0"
 KEYWORDS="-* x86"
 IUSE="opengl dedicated 3dfx"
 
-DEPEND=""
-RDEPEND="dedicated? ( app-misc/screen )
-       !dedicated? ( virtual/opengl )
-       opengl? ( virtual/opengl )"
+UIDEPEND="virtual/opengl
+       x86? (
+               || (
+                       (
+                               x11-libs/libXext
+                               x11-libs/libX11
+                               x11-libs/libXau
+                               x11-libs/libXdmcp )
+                       virtual/x11 ) )
+       amd64? (
+               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 ) )"
+
+RDEPEND="sys-libs/glibc
+       dedicated? ( app-misc/screen )
+       amd64? ( app-emulation/emul-linux-x86-baselibs )
+       opengl? ( ${UIDEPEND} )
+       !dedicated? ( !opengl? ( ${UIDEPEND} ) )"
 
 S=${WORKDIR}
 

diff --git a/games-fps/quake4-bin/ChangeLog b/games-fps/quake4-bin/ChangeLog
index d5b0d0bbafc2c49064f1b740a6cfcf83b6b3b23a..510d2fb12bc2a17eca8356546ea499d53719818d 100644 (file)
--- a/games-fps/quake4-bin/ChangeLog
+++ b/games-fps/quake4-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/quake4-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/ChangeLog,v 1.21 2006/05/09 16:03:04 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/ChangeLog,v 1.22 2006/06/06 18:48:42 wolf31o2 Exp $
+
+  06 Jun 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  quake4-bin-1.2.1.ebuild:
+  Added >=app-emulation/emul-linux-x86-xlibs-7.0 to the list of valid 32-bit
+  opengl providers for amd64 per bug #135643.
 
   09 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   -quake4-bin-1.2.ebuild:

diff --git a/games-fps/quake4-bin/quake4-bin-1.2.1.ebuild b/games-fps/quake4-bin/quake4-bin-1.2.1.ebuild
index 83b37f7ecb8546071f2a9ff758b4f6d498886289..cc1f17fd5c761867ca87c0e51b4e4407bc59c617 100644 (file)
--- a/games-fps/quake4-bin/quake4-bin-1.2.1.ebuild
+++ b/games-fps/quake4-bin/quake4-bin-1.2.1.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-bin/quake4-bin-1.2.1.ebuild,v 1.4 2006/05/09 15:57:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/quake4-bin/quake4-bin-1.2.1.ebuild,v 1.5 2006/06/06 18:48:42 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -28,6 +28,7 @@ UIDEPEND="virtual/opengl
                app-emulation/emul-linux-x86-sdl
                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 )"

diff --git a/games-fps/quake4-demo/ChangeLog b/games-fps/quake4-demo/ChangeLog
index 7b5285de4fd768dd1e78fffdebc5022104f43b15..113c92359526c5e2587f14391352bac37a8761b7 100644 (file)
--- 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 e6d26ac1243f9202a4bb8895be7233d0241c12d6..0c0bbfef01730e7a1381e18fa316c5cee56df7fd 100644 (file)
--- 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}