Fix category's dependencies for modular X.

(Portage version: 2.1_pre4-r1)

23 files changed, 121 insertions, 60 deletions

diff --git a/games-board/gnubg/ChangeLog b/games-board/gnubg/ChangeLog
index b7b02256d7ee..193ff9735153 100644
--- a/games-board/gnubg/ChangeLog
+++ b/games-board/gnubg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/gnubg
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.19 2005/09/20 14:55:59 mr_bones_ Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/ChangeLog,v 1.20 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  gnubg-0.14.3.ebuild:
+  Add modular X dependencies.
 
   20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
   -gnubg-0.13.0-r1.ebuild, -gnubg-0.14.2.ebuild:
diff --git a/games-board/gnubg/gnubg-0.14.3.ebuild b/games-board/gnubg/gnubg-0.14.3.ebuild
index 04e78b87bb64..ada6e72b04de 100644
--- a/games-board/gnubg/gnubg-0.14.3.ebuild
+++ b/games-board/gnubg/gnubg-0.14.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-board/gnubg/gnubg-0.14.3.ebuild,v 1.2 2005/02/25 22:07:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnubg/gnubg-0.14.3.ebuild,v 1.3 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit gnuconfig flag-o-matic games
 
@@ -32,13 +32,12 @@ DEPEND="virtual/libc
 		=dev-libs/glib-2*
 		opengl? ( x11-libs/gtkglext
 			media-libs/ftgl )
-		virtual/x11
 	)
 	guile? ( dev-util/guile )
 	nas? ( media-libs/nas )
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libXmu virtual/x11 ) )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-board/gnushogi/ChangeLog b/games-board/gnushogi/ChangeLog
index 9902cc55a0c2..54c44ee05b4b 100644
--- a/games-board/gnushogi/ChangeLog
+++ b/games-board/gnushogi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/gnushogi
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.10 2005/06/15 18:29:48 wolf31o2 Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/ChangeLog,v 1.11 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  gnushogi-1.3.ebuild:
+  Add modular X dependencies.
 
   15 Jun 2005; Chris Gianelloni <wolf31o2@gentoo.org> gnushogi-1.3.ebuild:
   Removed INSTALL file.
diff --git a/games-board/gnushogi/gnushogi-1.3.ebuild b/games-board/gnushogi/gnushogi-1.3.ebuild
index 09e39bd3b18f..fe0b699e820b 100644
--- a/games-board/gnushogi/gnushogi-1.3.ebuild
+++ b/games-board/gnushogi/gnushogi-1.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-board/gnushogi/gnushogi-1.3.ebuild,v 1.10 2005/06/15 18:29:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/gnushogi/gnushogi-1.3.ebuild,v 1.11 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -15,7 +15,7 @@ IUSE="X"
 
 RDEPEND="virtual/libc
 	sys-libs/ncurses
-	X? ( virtual/x11 )"
+	X? ( || ( x11-libs/libXaw virtual/x11 ) )"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.34
 	>=sys-devel/flex-2.5
diff --git a/games-board/mah-jong/ChangeLog b/games-board/mah-jong/ChangeLog
index 7739a6505948..6def0cb8c478 100644
--- a/games-board/mah-jong/ChangeLog
+++ b/games-board/mah-jong/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/mah-jong
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/ChangeLog,v 1.6 2004/11/11 00:51:27 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/ChangeLog,v 1.7 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  mah-jong-1.6.3.ebuild:
+  Drop x11 dependency since build explicitly uses gtk-config for libraries.
 
   11 Nov 2004; Joseph Jezak <josejx@gentoo.org> mah-jong-1.6.3.ebuild:
   Marked ppc stable.
diff --git a/games-board/mah-jong/mah-jong-1.6.3.ebuild b/games-board/mah-jong/mah-jong-1.6.3.ebuild
index a1c9af9516ed..b1f4734ad361 100644
--- a/games-board/mah-jong/mah-jong-1.6.3.ebuild
+++ b/games-board/mah-jong/mah-jong-1.6.3.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-board/mah-jong/mah-jong-1.6.3.ebuild,v 1.5 2005/07/06 04:44:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/mah-jong/mah-jong-1.6.3.ebuild,v 1.6 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit games
 
@@ -14,8 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
-	=x11-libs/gtk+-1.2*"
+RDEPEND="=x11-libs/gtk+-1.2*"
 DEPEND="${RDEPEND}
 	dev-lang/perl"
 
diff --git a/games-board/scid/ChangeLog b/games-board/scid/ChangeLog
index 475fa3bb1fc4..fd88e88726ea 100644
--- a/games-board/scid/ChangeLog
+++ b/games-board/scid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/scid
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.10 2005/09/16 01:14:05 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/ChangeLog,v 1.11 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> scid-3.5.ebuild,
+  scid-3.6.1.ebuild:
+  Add modular X dependencies.
 
   16 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org> scid-3.5.ebuild,
   scid-3.6.1.ebuild:
diff --git a/games-board/scid/scid-3.5.ebuild b/games-board/scid/scid-3.5.ebuild
index a5f887621bf2..4ce6e62bd9ec 100644
--- a/games-board/scid/scid-3.5.ebuild
+++ b/games-board/scid/scid-3.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-board/scid/scid-3.5.ebuild,v 1.5 2005/09/16 01:14:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-3.5.ebuild,v 1.6 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit games
 
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=dev-lang/tk-8.3
+DEPEND=">=dev-lang/tk-8.3
 	>=sys-libs/zlib-1.1.3"
 RDEPEND="${DEPEND}
+	|| ( x11-libs/libX11 virtual/x11 )
 	>=dev-lang/python-2.1"
 DEPEND="${DEPEND}
 	app-arch/unzip"
diff --git a/games-board/scid/scid-3.6.1.ebuild b/games-board/scid/scid-3.6.1.ebuild
index 8eb43d5a88ef..889ec98bf34c 100644
--- a/games-board/scid/scid-3.6.1.ebuild
+++ b/games-board/scid/scid-3.6.1.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-board/scid/scid-3.6.1.ebuild,v 1.4 2005/09/16 01:14:05 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/scid/scid-3.6.1.ebuild,v 1.5 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit games
 
@@ -17,10 +17,10 @@ SLOT="0"
 KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/x11
-	>=dev-lang/tk-8.3
+DEPEND=">=dev-lang/tk-8.3
 	>=sys-libs/zlib-1.1.3"
 RDEPEND="${DEPEND}
+	|| ( x11-libs/libX11 virtual/x11 )
 	>=dev-lang/python-2.1"
 DEPEND="${DEPEND}
 	app-arch/unzip"
diff --git a/games-board/teg/ChangeLog b/games-board/teg/ChangeLog
index 38e746a90dfb..242178ebfa16 100644
--- a/games-board/teg/ChangeLog
+++ b/games-board/teg/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-board/teg
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/teg/ChangeLog,v 1.10 2004/12/28 23:58:57 ciaranm Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/teg/ChangeLog,v 1.11 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> teg-0.11.1.ebuild:
+  Removed x11 dependency since all the X stuff is brought in by the Gnome libs.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/games-board/teg/teg-0.11.1.ebuild b/games-board/teg/teg-0.11.1.ebuild
index 40bb992092e0..8b0b7df9e4b7 100644
--- a/games-board/teg/teg-0.11.1.ebuild
+++ b/games-board/teg/teg-0.11.1.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-board/teg/teg-0.11.1.ebuild,v 1.6 2005/01/06 21:59:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/teg/teg-0.11.1.ebuild,v 1.7 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit gnome2
 
@@ -14,7 +14,6 @@ KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
 DEPEND="virtual/libc
-	virtual/x11
 	dev-libs/glib
 	gnome-base/libgnomeui
 	gnome-base/libgnome"
diff --git a/games-board/xfreecell/ChangeLog b/games-board/xfreecell/ChangeLog
index a9ed909222af..d2063572278f 100644
--- a/games-board/xfreecell/ChangeLog
+++ b/games-board/xfreecell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xfreecell
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/ChangeLog,v 1.6 2005/02/06 17:04:33 corsair Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/ChangeLog,v 1.7 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xfreecell-1.0.5b.ebuild:
+  Add modular X dependencies.
 
   06 Feb 2005; Markus Rothe <corsair@gentoo.org> xfreecell-1.0.5b.ebuild:
   Stable on ppc64
diff --git a/games-board/xfreecell/xfreecell-1.0.5b.ebuild b/games-board/xfreecell/xfreecell-1.0.5b.ebuild
index 3962d8dd69ff..3b7d3d8d60f2 100644
--- a/games-board/xfreecell/xfreecell-1.0.5b.ebuild
+++ b/games-board/xfreecell/xfreecell-1.0.5b.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-board/xfreecell/xfreecell-1.0.5b.ebuild,v 1.8 2005/02/06 17:04:33 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfreecell/xfreecell-1.0.5b.ebuild,v 1.9 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -15,7 +15,9 @@ SLOT="0"
 KEYWORDS="x86 ppc64 ~ppc ~amd64"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-board/xfrisk/xfrisk-1.2.ebuild b/games-board/xfrisk/xfrisk-1.2.ebuild
index 3ea98758018a..ca828441908e 100644
--- a/games-board/xfrisk/xfrisk-1.2.ebuild
+++ b/games-board/xfrisk/xfrisk-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xfrisk/xfrisk-1.2.ebuild,v 1.4 2004/06/24 22:22:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xfrisk/xfrisk-1.2.ebuild,v 1.5 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit games
 
@@ -14,9 +14,10 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( x11-libs/libXmu virtual/x11 )
 	x11-libs/Xaw3d"
 DEPEND="${RDEPEND}
+	|| ( x11-libs/libXaw virtual/x11 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/games-board/xgammon/ChangeLog b/games-board/xgammon/ChangeLog
index e47c753d7c84..3dfee3593004 100644
--- a/games-board/xgammon/ChangeLog
+++ b/games-board/xgammon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xgammon
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/ChangeLog,v 1.7 2004/12/22 01:42:52 absinthe Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/ChangeLog,v 1.8 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xgammon-0.98.ebuild:
+  Add modular X dependencies.
 
   21 Dec 2004; Dylan Carlson <absinthe@gentoo.org> xgammon-0.98.ebuild:
   keywords ~amd64.
diff --git a/games-board/xgammon/xgammon-0.98.ebuild b/games-board/xgammon/xgammon-0.98.ebuild
index 505f5a2eb49d..63fbfe2fb3ad 100644
--- a/games-board/xgammon/xgammon-0.98.ebuild
+++ b/games-board/xgammon/xgammon-0.98.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-board/xgammon/xgammon-0.98.ebuild,v 1.7 2004/12/22 01:42:52 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xgammon/xgammon-0.98.ebuild,v 1.8 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit eutils
 
@@ -14,7 +14,11 @@ SLOT="0"
 KEYWORDS="x86 ppc sparc ~amd64"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXaw virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( app-text/rman
+			x11-misc/imake )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-board/xmahjongg/ChangeLog b/games-board/xmahjongg/ChangeLog
index 6a850652819a..f7dd921785b3 100644
--- a/games-board/xmahjongg/ChangeLog
+++ b/games-board/xmahjongg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xmahjongg
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/ChangeLog,v 1.7 2005/12/08 21:48:00 mr_bones_ Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/ChangeLog,v 1.8 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xmahjongg-3.6.1.ebuild, xmahjongg-3.7.ebuild:
+  Add modular X dependencies.
 
 *xmahjongg-3.7 (08 Dec 2005)
 
diff --git a/games-board/xmahjongg/xmahjongg-3.6.1.ebuild b/games-board/xmahjongg/xmahjongg-3.6.1.ebuild
index 10d15c7b8bb3..42d8e262106b 100644
--- a/games-board/xmahjongg/xmahjongg-3.6.1.ebuild
+++ b/games-board/xmahjongg/xmahjongg-3.6.1.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-board/xmahjongg/xmahjongg-3.6.1.ebuild,v 1.6 2005/10/29 08:44:03 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/xmahjongg-3.6.1.ebuild,v 1.7 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit games
 
@@ -13,9 +13,13 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libSM
+				x11-libs/libX11 )
+			virtual/x11 )
 	media-libs/libpng
 	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_compile() {
 	egamesconf --with-x
diff --git a/games-board/xmahjongg/xmahjongg-3.7.ebuild b/games-board/xmahjongg/xmahjongg-3.7.ebuild
index 3a5eaaeeca00..60eab2e27c5f 100644
--- a/games-board/xmahjongg/xmahjongg-3.7.ebuild
+++ b/games-board/xmahjongg/xmahjongg-3.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-board/xmahjongg/xmahjongg-3.7.ebuild,v 1.1 2005/12/08 21:48:00 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmahjongg/xmahjongg-3.7.ebuild,v 1.2 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit games
 
@@ -13,9 +13,13 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc-macos x86"
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libSM
+				x11-libs/libX11 )
+			virtual/x11 )
 	media-libs/libpng
 	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	|| ( x11-libs/libXt virtual/x11 )"
 
 src_install() {
 	make DESTDIR="${D}" install || die "make install failed"
diff --git a/games-board/xmille/ChangeLog b/games-board/xmille/ChangeLog
index 2ea4540d1320..6573442f2ec4 100644
--- a/games-board/xmille/ChangeLog
+++ b/games-board/xmille/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xmille
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/ChangeLog,v 1.7 2006/01/09 06:03:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/ChangeLog,v 1.8 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xmille-2.0-r1.ebuild:
+  Add modular X dependencies.
 
   09 Jan 2006; Michael Sterrett <mr_bones_@gentoo.org> xmille-2.0-r1.ebuild:
   tidy; debian patch bump
diff --git a/games-board/xmille/xmille-2.0-r1.ebuild b/games-board/xmille/xmille-2.0-r1.ebuild
index 973d4f071161..353543f26f37 100644
--- a/games-board/xmille/xmille-2.0-r1.ebuild
+++ b/games-board/xmille/xmille-2.0-r1.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-board/xmille/xmille-2.0-r1.ebuild,v 1.8 2006/01/09 06:03:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xmille/xmille-2.0-r1.ebuild,v 1.9 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit eutils games
 
@@ -15,7 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( x11-libs/libXext virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( app-text/rman
+			x11-misc/imake )
+		virtual/x11 )"
 
 S=${WORKDIR}/${P}.orig
 
diff --git a/games-board/xscrabble/ChangeLog b/games-board/xscrabble/ChangeLog
index 3ebe6fc8be2e..53fe25f2e414 100644
--- a/games-board/xscrabble/ChangeLog
+++ b/games-board/xscrabble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-board/xscrabble
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.7 2005/08/27 11:53:34 grobian Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/ChangeLog,v 1.8 2006/01/29 21:28:01 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  xscrabble-2.10-r1.ebuild:
+  Add modular X dependencies.
 
   27 Aug 2005; Fabian Groffen <grobian@gentoo.org> xscrabble-2.10-r1.ebuild:
   Marking ~ppc-macos (bug #82575)
diff --git a/games-board/xscrabble/xscrabble-2.10-r1.ebuild b/games-board/xscrabble/xscrabble-2.10-r1.ebuild
index fcc3c6be4dbf..a67648bb1976 100644
--- a/games-board/xscrabble/xscrabble-2.10-r1.ebuild
+++ b/games-board/xscrabble/xscrabble-2.10-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-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.2 2005/08/27 11:53:34 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/xscrabble/xscrabble-2.10-r1.ebuild,v 1.3 2006/01/29 21:28:01 joshuabaergen Exp $
 
 inherit eutils games multilib
 
@@ -15,7 +15,13 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc-macos x86"
 IUSE=""
 
-DEPEND="virtual/x11"
+RDEPEND="|| ( ( x11-libs/libXaw
+				x11-libs/libXp )
+			virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( ( x11-misc/gccmakedep
+			x11-misc/imake )
+		virtual/x11 )"
 
 src_unpack() {
 	unpack ${P}.tgz