Fix dependencies for modular X.

(Portage version: 2.1_pre4)

40 files changed, 192 insertions, 109 deletions

diff --git a/games-action/0verkill/0verkill-0.16-r2.ebuild b/games-action/0verkill/0verkill-0.16-r2.ebuild
index d8791eb77e51..12f85b4b5d8d 100644
--- a/games-action/0verkill/0verkill-0.16-r2.ebuild
+++ b/games-action/0verkill/0verkill-0.16-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r2.ebuild,v 1.7 2005/09/26 19:23:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/0verkill-0.16-r2.ebuild,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE="X"
 
-RDEPEND="X? ( virtual/x11 )"
+RDEPEND="X? ( || ( x11-libs/libXpm virtual/x11 ) )"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
diff --git a/games-action/0verkill/ChangeLog b/games-action/0verkill/ChangeLog
index 2e59d8d00ba6..f1e063c6f3dd 100644
--- a/games-action/0verkill/ChangeLog
+++ b/games-action/0verkill/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/0verkill
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.10 2005/09/26 19:23:07 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/0verkill/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  0verkill-0.16-r2.ebuild:
+  Add modular X dependencies.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   0verkill-0.16-r2.ebuild:
diff --git a/games-action/abuse_sdl/ChangeLog b/games-action/abuse_sdl/ChangeLog
index e0862c483b3d..ddfc1e9ad9cb 100644
--- a/games-action/abuse_sdl/ChangeLog
+++ b/games-action/abuse_sdl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/abuse_sdl
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/ChangeLog,v 1.7 2005/06/15 17:30:25 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/ChangeLog,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  abuse_sdl-0.7.0-r2.ebuild:
+  Add modular X dependencies.
 
   15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org>
   abuse_sdl-0.7.0-r2.ebuild:
diff --git a/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild b/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild
index 5653d8777885..c1ce38607dd7 100644
--- a/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild
+++ b/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild,v 1.7 2005/06/15 17:30:25 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/abuse_sdl/abuse_sdl-0.7.0-r2.ebuild,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -14,9 +14,10 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc"
 IUSE=""
 
-RDEPEND="virtual/x11
-	>=media-libs/libsdl-1.1.6"
+RDEPEND=">=media-libs/libsdl-1.1.6"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )
+	virtual/opengl
 	>=sys-apps/sed-4"
 
 DATA="${WORKDIR}/datafiles"
diff --git a/games-action/atanks/ChangeLog b/games-action/atanks/ChangeLog
index 1398081748f9..f7ede54e3f0d 100644
--- a/games-action/atanks/ChangeLog
+++ b/games-action/atanks/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/atanks
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/ChangeLog,v 1.16 2005/08/19 02:31:54 halcy0n Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/ChangeLog,v 1.17 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  atanks-1.1.0.ebuild:
+  Remove x11 dependencies as this package does not directly depend on X.
 
   19 Aug 2005; Mark Loeser <halcy0n@gentoo.org> -files/atanks-gcc34.patch,
   +files/atanks-1.1.0-gcc4.patch, atanks-1.1.0.ebuild:
diff --git a/games-action/atanks/atanks-1.1.0.ebuild b/games-action/atanks/atanks-1.1.0.ebuild
index 5b0823bad4c5..1d8858c30733 100644
--- a/games-action/atanks/atanks-1.1.0.ebuild
+++ b/games-action/atanks/atanks-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-1.1.0.ebuild,v 1.13 2005/08/19 02:31:54 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-1.1.0.ebuild,v 1.14 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils toolchain-funcs games
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=media-libs/allegro-4.0.3
+DEPEND=">=media-libs/allegro-4.0.3
 	>=media-libs/allegttf-2.0"
 
 S=${WORKDIR}/${PN}
diff --git a/games-action/battalion/ChangeLog b/games-action/battalion/ChangeLog
index f8dc6dce63ad..80d8c56f2370 100644
--- a/games-action/battalion/ChangeLog
+++ b/games-action/battalion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/battalion
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.7 2005/09/26 19:40:00 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  battalion-1.4b.ebuild:
+  Add modular X dependencies.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> battalion-1.4b.ebuild:
   Marking stable on x86.
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b.ebuild
index a43efa3b916d..fa8a3a109536 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.9 2005/09/26 19:40:00 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )
 	virtual/opengl"
 
 DEPEND="${RDEPEND}
diff --git a/games-action/chickens/ChangeLog b/games-action/chickens/ChangeLog
index 74091bf4c0ab..e4914f9df3c6 100644
--- a/games-action/chickens/ChangeLog
+++ b/games-action/chickens/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/chickens
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chickens/ChangeLog,v 1.7 2005/08/11 09:53:57 r3pek Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/chickens/ChangeLog,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  chickens-0.2.4.ebuild:
+  Drop x11 dependencies as chickens doesn't actually depend on X directly.
 
   11 Aug 2005; Carlos Silva <r3pek@gentoo.org> chickens-0.2.4.ebuild:
   marked ~amd64. closes bug #102024
diff --git a/games-action/chickens/chickens-0.2.4.ebuild b/games-action/chickens/chickens-0.2.4.ebuild
index 8a1b3ade6c27..a9ec60e8880f 100644
--- a/games-action/chickens/chickens-0.2.4.ebuild
+++ b/games-action/chickens/chickens-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/chickens/chickens-0.2.4.ebuild,v 1.4 2005/08/11 09:53:57 r3pek Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/chickens/chickens-0.2.4.ebuild,v 1.5 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	media-libs/allegro"
+DEPEND="media-libs/allegro"
 
 S=${WORKDIR}/chickens
 
diff --git a/games-action/cylindrix/ChangeLog b/games-action/cylindrix/ChangeLog
index a0c41f0ed644..0711fbb22c9f 100644
--- a/games-action/cylindrix/ChangeLog
+++ b/games-action/cylindrix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/cylindrix
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/ChangeLog,v 1.3 2004/06/24 21:53:39 agriffis Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/ChangeLog,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  cylindrix-1.0.ebuild:
+  Drop x11 dependencies as this package doesn't actually depend on X directly.
 
   19 Apr 2004; David Holm <dholm@gentoo.org> cylindrix-1.0.ebuild:
   Added to ~ppc.
diff --git a/games-action/cylindrix/cylindrix-1.0.ebuild b/games-action/cylindrix/cylindrix-1.0.ebuild
index 6547f4daa79b..b080866fde29 100644
--- a/games-action/cylindrix/cylindrix-1.0.ebuild
+++ b/games-action/cylindrix/cylindrix-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/cylindrix-1.0.ebuild,v 1.3 2004/06/24 21:53:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/cylindrix/cylindrix-1.0.ebuild,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=media-libs/allegro-4.0.3"
+DEPEND=">=media-libs/allegro-4.0.3"
 
 S=${WORKDIR}/${PN}
 
diff --git a/games-action/glaxium/ChangeLog b/games-action/glaxium/ChangeLog
index e4c26bbb7676..ffcc3511a044 100644
--- a/games-action/glaxium/ChangeLog
+++ b/games-action/glaxium/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/glaxium
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.10 2005/05/17 17:33:54 wolf31o2 Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> glaxium-0.5.ebuild:
+  Add modular X dependencies.
 
   17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> glaxium-0.5.ebuild:
   Cleanup for bug #92745.
diff --git a/games-action/glaxium/glaxium-0.5.ebuild b/games-action/glaxium/glaxium-0.5.ebuild
index cbc51b5672ac..b892341815c7 100644
--- a/games-action/glaxium/glaxium-0.5.ebuild
+++ b/games-action/glaxium/glaxium-0.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.12 2005/05/17 17:33:54 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/glaxium/glaxium-0.5.ebuild,v 1.13 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -13,13 +13,16 @@ SLOT="0"
 KEYWORDS="x86 ppc amd64"
 IUSE=""
 
-DEPEND=">=media-libs/libsdl-1.1.5
+RDEPEND=">=media-libs/libsdl-1.1.5
 	>=media-libs/sdl-mixer-1.2.4
-	virtual/x11
+	|| ( ( x11-libs/libXmu
+			x11-libs/libXi )
+		virtual/x11 )
 	virtual/opengl
 	virtual/glu
 	virtual/glut
 	>=media-libs/libpng-1.0.0"
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${PN}_${PV}"
 
diff --git a/games-action/heroes/ChangeLog b/games-action/heroes/ChangeLog
index 57ed0a623bba..3a483957c06f 100644
--- a/games-action/heroes/ChangeLog
+++ b/games-action/heroes/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/heroes
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.10 2005/09/26 17:35:09 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  heroes-0.21-r1.ebuild:
+  Remove x11 dependencies as this package does not directly depend on X.
 
   26 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> heroes-0.21-r1.ebuild:
   Making games last on inherit line.
diff --git a/games-action/heroes/heroes-0.21-r1.ebuild b/games-action/heroes/heroes-0.21-r1.ebuild
index bdab08c20989..17c85ca8a477 100644
--- a/games-action/heroes/heroes-0.21-r1.ebuild
+++ b/games-action/heroes/heroes-0.21-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.3 2005/09/26 17:35:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/heroes/heroes-0.21-r1.ebuild,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -20,8 +20,7 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc ~amd64"
 IUSE="sdl nls ggi"
 
-DEPEND="virtual/x11
-	nls? ( sys-devel/gettext )
+DEPEND="nls? ( sys-devel/gettext )
 	sdl? ( media-libs/libsdl media-libs/sdl-mixer )
 	ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod )
 	!sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) )"
diff --git a/games-action/nighthawk/ChangeLog b/games-action/nighthawk/ChangeLog
index e8da13678ff4..3f4a1323f4ac 100644
--- a/games-action/nighthawk/ChangeLog
+++ b/games-action/nighthawk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/nighthawk
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/ChangeLog,v 1.9 2005/05/31 09:32:09 cryos Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/ChangeLog,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  nighthawk-2.2.ebuild:
+  Add modular X dependencies.
 
   31 May 2005; Marcus D. Hanwell <marcus@gentoo.org> nighthawk-2.2.ebuild:
   Stable on amd64.
diff --git a/games-action/nighthawk/nighthawk-2.2.ebuild b/games-action/nighthawk/nighthawk-2.2.ebuild
index 5cf0dc71ccca..8ee27f8e7353 100644
--- a/games-action/nighthawk/nighthawk-2.2.ebuild
+++ b/games-action/nighthawk/nighthawk-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/nighthawk-2.2.ebuild,v 1.8 2005/05/31 09:32:09 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/nighthawk/nighthawk-2.2.ebuild,v 1.9 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| ( x11-libs/libXpm virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/parsec/ChangeLog b/games-action/parsec/ChangeLog
index ae7db64417a0..84c2b43010d2 100644
--- a/games-action/parsec/ChangeLog
+++ b/games-action/parsec/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/parsec
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/parsec/ChangeLog,v 1.8 2006/01/15 14:43:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/parsec/ChangeLog,v 1.9 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> parsec-0197.ebuild:
+  Add modular X dependencies.
 
   15 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org> parsec-0197.ebuild:
   preserve execute permissions.  bug #119081
diff --git a/games-action/parsec/parsec-0197.ebuild b/games-action/parsec/parsec-0197.ebuild
index 37fc7637bfa0..98da839e883f 100644
--- a/games-action/parsec/parsec-0197.ebuild
+++ b/games-action/parsec/parsec-0197.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-action/parsec/parsec-0197.ebuild,v 1.9 2006/01/15 14:43:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/parsec/parsec-0197.ebuild,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( x11-libs/libXi virtual/x11 )
 	virtual/opengl
 	virtual/glut
 	virtual/glu
diff --git a/games-action/phobiaiii/ChangeLog b/games-action/phobiaiii/ChangeLog
index 854edae9b242..7d5e79746dbf 100644
--- a/games-action/phobiaiii/ChangeLog
+++ b/games-action/phobiaiii/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/phobiaiii
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaiii/ChangeLog,v 1.5 2004/06/24 21:58:18 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaiii/ChangeLog,v 1.6 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  phobiaiii-1.0-r1.ebuild, phobiaiii-1.0-r2.ebuild:
+  Add modular X dependencies.
 
 *phobiaiii-1.0-r2 (10 Feb 2004)
 
diff --git a/games-action/phobiaiii/phobiaiii-1.0-r1.ebuild b/games-action/phobiaiii/phobiaiii-1.0-r1.ebuild
index 905c5e8b3929..a476c277479c 100644
--- a/games-action/phobiaiii/phobiaiii-1.0-r1.ebuild
+++ b/games-action/phobiaiii/phobiaiii-1.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaiii/phobiaiii-1.0-r1.ebuild,v 1.4 2004/07/14 14:21:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaiii/phobiaiii-1.0-r1.ebuild,v 1.5 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -18,7 +18,7 @@ RDEPEND="kde-base/arts
 	media-sound/esound
 	media-libs/audiofile
 	media-libs/sdl-mixer
-	virtual/x11
+	|| ( x11-libs/libXext virtual/x11 )
 	media-libs/libvorbis
 	media-libs/libogg
 	>=sys-libs/lib-compat-1.3
diff --git a/games-action/phobiaiii/phobiaiii-1.0-r2.ebuild b/games-action/phobiaiii/phobiaiii-1.0-r2.ebuild
index efb9539f8289..155d59518673 100644
--- a/games-action/phobiaiii/phobiaiii-1.0-r2.ebuild
+++ b/games-action/phobiaiii/phobiaiii-1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaiii/phobiaiii-1.0-r2.ebuild,v 1.2 2004/06/24 21:58:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/phobiaiii/phobiaiii-1.0-r2.ebuild,v 1.3 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -19,7 +19,7 @@ RDEPEND="kde-base/arts
 	media-sound/esound
 	media-libs/audiofile
 	media-libs/sdl-mixer
-	virtual/x11
+	|| ( x11-libs/libXext virtual/x11 )
 	media-libs/libvorbis
 	media-libs/libogg
 	>=sys-libs/lib-compat-1.3
diff --git a/games-action/poopmup/ChangeLog b/games-action/poopmup/ChangeLog
index 24836a89639a..6ba198249a4d 100644
--- a/games-action/poopmup/ChangeLog
+++ b/games-action/poopmup/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/poopmup
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.7 2005/05/17 17:35:52 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/ChangeLog,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> poopmup-1.2.ebuild:
+  Add modular X dependencies.
 
   17 May 2005; Chris Gianelloni <wolf31o2@gentoo.org> poopmup-1.2.ebuild:
   Cleanup for bug #92745.
diff --git a/games-action/poopmup/poopmup-1.2.ebuild b/games-action/poopmup/poopmup-1.2.ebuild
index 3d155cea3f36..a3fe413c28d9 100644
--- a/games-action/poopmup/poopmup-1.2.ebuild
+++ b/games-action/poopmup/poopmup-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.10 2005/05/17 17:35:52 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/poopmup/poopmup-1.2.ebuild,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit toolchain-funcs games
 
@@ -14,7 +14,9 @@ KEYWORDS="x86 ppc amd64"
 IUSE=""
 
 DEPEND="virtual/glut
-	virtual/x11
+	|| ( ( x11-libs/libXi
+			x11-libs/libXmu )
+		virtual/x11 )
 	virtual/opengl"
 
 S=${WORKDIR}/${PN}
diff --git a/games-action/shootingstar/ChangeLog b/games-action/shootingstar/ChangeLog
index 50ad524e4064..bf0e45ef0d6f 100644
--- a/games-action/shootingstar/ChangeLog
+++ b/games-action/shootingstar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/shootingstar
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/shootingstar/ChangeLog,v 1.3 2004/07/26 21:53:12 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/shootingstar/ChangeLog,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  shootingstar-1.2.0.ebuild:
+  Remove x11 dependencies as this package does not directly depend on X.
 
   26 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
   +files/1.2.0-gcc34.patch, shootingstar-1.2.0.ebuild:
diff --git a/games-action/shootingstar/shootingstar-1.2.0.ebuild b/games-action/shootingstar/shootingstar-1.2.0.ebuild
index db92aa369c17..9f67c851cc4c 100644
--- a/games-action/shootingstar/shootingstar-1.2.0.ebuild
+++ b/games-action/shootingstar/shootingstar-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/shootingstar/shootingstar-1.2.0.ebuild,v 1.3 2004/07/26 21:53:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/shootingstar/shootingstar-1.2.0.ebuild,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/opengl
+DEPEND="virtual/opengl
 	virtual/glu
 	>=media-libs/libsdl-1.2
 	media-libs/sdl-mixer
diff --git a/games-action/slune/ChangeLog b/games-action/slune/ChangeLog
index 2cbbd7e6ee27..34f862cae824 100644
--- a/games-action/slune/ChangeLog
+++ b/games-action/slune/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/slune
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/slune/ChangeLog,v 1.11 2005/09/07 04:48:30 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/slune/ChangeLog,v 1.12 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> slune-1.0.9.ebuild:
+  This is a Python app, so it's doesn't depend on any X libraries directly.
+  Drop the dependency.
 
 *slune-1.0.9 (06 Sep 2005)
 
diff --git a/games-action/slune/slune-1.0.9.ebuild b/games-action/slune/slune-1.0.9.ebuild
index b3d019530965..b992146d8e6e 100644
--- a/games-action/slune/slune-1.0.9.ebuild
+++ b/games-action/slune/slune-1.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/slune/slune-1.0.9.ebuild,v 1.1 2005/09/07 04:48:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/slune/slune-1.0.9.ebuild,v 1.2 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit distutils
 
@@ -13,8 +13,7 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	virtual/opengl
+DEPEND="virtual/opengl
 	>=media-libs/libsdl-1.2.6
 	>=dev-lang/python-2.2.2
 	>=dev-python/soya-0.9
diff --git a/games-action/transcend/ChangeLog b/games-action/transcend/ChangeLog
index 594bb4ad528a..c2161c3f15b0 100644
--- a/games-action/transcend/ChangeLog
+++ b/games-action/transcend/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/transcend
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/ChangeLog,v 1.3 2005/09/04 02:27:07 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/ChangeLog,v 1.4 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  transcend-0.2.ebuild, transcend-0.3.ebuild:
+  Add modular X dependencies.
 
 *transcend-0.3 (04 Sep 2005)
 
diff --git a/games-action/transcend/transcend-0.2.ebuild b/games-action/transcend/transcend-0.2.ebuild
index 12ff9c7881b6..706abce466ba 100644
--- a/games-action/transcend/transcend-0.2.ebuild
+++ b/games-action/transcend/transcend-0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/transcend-0.2.ebuild,v 1.2 2005/02/22 12:21:54 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/transcend-0.2.ebuild,v 1.3 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -13,8 +13,9 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 
-DEPEND="virtual/libc
-	virtual/x11
+DEPEND="|| ( ( x11-libs/libXmu
+				x11-libs/libXi )
+			virtual/x11 )
 	virtual/opengl
 	virtual/glu
 	virtual/glut"
diff --git a/games-action/transcend/transcend-0.3.ebuild b/games-action/transcend/transcend-0.3.ebuild
index a5f80df7a50b..02a3499c57c3 100644
--- a/games-action/transcend/transcend-0.3.ebuild
+++ b/games-action/transcend/transcend-0.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/transcend-0.3.ebuild,v 1.1 2005/09/04 02:27:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/transcend/transcend-0.3.ebuild,v 1.2 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -13,7 +13,9 @@ SLOT="0"
 KEYWORDS="~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+DEPEND="|| ( ( x11-libs/libXmu
+				x11-libs/libXi )
+			virtual/x11 )
 	virtual/opengl
 	virtual/glu
 	virtual/glut"
diff --git a/games-action/xblast/ChangeLog b/games-action/xblast/ChangeLog
index dfde146ca04a..defea8fe1b84 100644
--- a/games-action/xblast/ChangeLog
+++ b/games-action/xblast/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xblast
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/ChangeLog,v 1.9 2005/08/23 19:23:37 wolf31o2 Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/ChangeLog,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xblast-2.10.0.ebuild, xblast-2.10.2.ebuild:
+  Add modular X dependencies.
 
   23 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> xblast-2.10.2.ebuild:
   cp -dpR -> cp -pPR for bug #103487.
diff --git a/games-action/xblast/xblast-2.10.0.ebuild b/games-action/xblast/xblast-2.10.0.ebuild
index 780ff985cc7b..29867624cc2e 100644
--- a/games-action/xblast/xblast-2.10.0.ebuild
+++ b/games-action/xblast/xblast-2.10.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/xblast-2.10.0.ebuild,v 1.1 2005/02/02 07:30:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/xblast-2.10.0.ebuild,v 1.2 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,8 +13,12 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libICE
+				x11-libs/libX11 )
+			virtual/x11 )
 	media-libs/libpng"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/xblast/xblast-2.10.2.ebuild b/games-action/xblast/xblast-2.10.2.ebuild
index 9b308c25af87..89345ab8a9b1 100644
--- a/games-action/xblast/xblast-2.10.2.ebuild
+++ b/games-action/xblast/xblast-2.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/xblast-2.10.2.ebuild,v 1.4 2005/08/23 19:23:37 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xblast/xblast-2.10.2.ebuild,v 1.5 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit games
 
@@ -25,8 +25,12 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libICE
+				x11-libs/libX11 )
+			virtual/x11 )
 	media-libs/libpng"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_compile() {
 	export MY_DATADIR="${GAMES_DATADIR}/${PN}"
diff --git a/games-action/xbomber/ChangeLog b/games-action/xbomber/ChangeLog
index d1eacdf67e86..f9290b5f32ba 100644
--- a/games-action/xbomber/ChangeLog
+++ b/games-action/xbomber/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-action/xbomber
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.7 2005/11/06 16:12:01 kugelfang Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.8 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> xbomber-101.ebuild:
+  Add modular X dependencies.
 
   06 Nov 2005; Danny van Dyk <kugelfang@gentoo.org>
   +files/xbomber-101-va_list.patch, xbomber-101.ebuild:
diff --git a/games-action/xbomber/xbomber-101.ebuild b/games-action/xbomber/xbomber-101.ebuild
index 5a2750b61ad6..feac253f43c7 100644
--- a/games-action/xbomber/xbomber-101.ebuild
+++ b/games-action/xbomber/xbomber-101.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.9 2005/11/06 17:19:12 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.10 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+DEPEND="|| ( x11-libs/libX11 virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-action/xshipwars/ChangeLog b/games-action/xshipwars/ChangeLog
index e54444e4ff2b..c98b04133901 100644
--- a/games-action/xshipwars/ChangeLog
+++ b/games-action/xshipwars/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xshipwars
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.10 2005/11/08 04:55:26 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/ChangeLog,v 1.11 2006/01/28 21:19:10 joshuabaergen Exp $
+
+  28 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xshipwars-1.34.0.ebuild, xshipwars-2.4.7.ebuild:
+  Add modular X dependencies.
 
 *xshipwars-2.4.7 (08 Nov 2005)
 
diff --git a/games-action/xshipwars/xshipwars-1.34.0.ebuild b/games-action/xshipwars/xshipwars-1.34.0.ebuild
index ef9673354c58..fdd221b74108 100644
--- a/games-action/xshipwars/xshipwars-1.34.0.ebuild
+++ b/games-action/xshipwars/xshipwars-1.34.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-1.34.0.ebuild,v 1.14 2005/08/07 12:49:31 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-1.34.0.ebuild,v 1.15 2006/01/28 21:19:10 joshuabaergen Exp $
 
 inherit toolchain-funcs eutils games
 
@@ -18,8 +18,10 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
 	>=media-sound/esound-0.2.23"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/games-action/xshipwars/xshipwars-2.4.7.ebuild b/games-action/xshipwars/xshipwars-2.4.7.ebuild
index 21f4bc291f4b..7d6ffaae98bb 100644
--- a/games-action/xshipwars/xshipwars-2.4.7.ebuild
+++ b/games-action/xshipwars/xshipwars-2.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.4.7.ebuild,v 1.2 2005/11/08 04:56:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xshipwars/xshipwars-2.4.7.ebuild,v 1.3 2006/01/28 21:19:11 joshuabaergen Exp $
 
 inherit toolchain-funcs eutils games
 
@@ -17,10 +17,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="joystick yiff esd"
 
-DEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXpm virtual/x11 )
 	joystick? ( media-libs/libjsw )
 	yiff? ( media-libs/yiff )
 	esd? ( >=media-sound/esound-0.2.23 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 S=${WORKDIR}/${MY_P}