Fix this category's dependencies to work with modular X.

Package-Manager: portage-2.1_pre4

8 files changed, 61 insertions, 25 deletions

diff --git a/games-engines/freesci/ChangeLog b/games-engines/freesci/ChangeLog
index 9e0a0788122a..baf52159fd59 100644
--- a/games-engines/freesci/ChangeLog
+++ b/games-engines/freesci/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/freesci
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/ChangeLog,v 1.10 2004/09/11 09:02:23 blubb Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/ChangeLog,v 1.11 2006/01/29 00:11:38 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  freesci-0.3.4c.ebuild, freesci-0.6.1b.ebuild:
+  Add modular X dependencies.
 
   11 Sep 2004; <blubb@gentoo.org> freesci-0.6.1b.ebuild:
   added ~amd64 keyword
diff --git a/games-engines/freesci/freesci-0.3.4c.ebuild b/games-engines/freesci/freesci-0.3.4c.ebuild
index 3a33de42f3e9..9f11ac8d8a69 100644
--- a/games-engines/freesci/freesci-0.3.4c.ebuild
+++ b/games-engines/freesci/freesci-0.3.4c.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-engines/freesci/freesci-0.3.4c.ebuild,v 1.4 2005/04/15 04:05:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.3.4c.ebuild,v 1.5 2006/01/29 00:11:38 joshuabaergen Exp $
 
 inherit flag-o-matic games
 
@@ -16,7 +16,9 @@ IUSE="X ggi directfb alsa sdl ncurses"
 
 RDEPEND="virtual/libc
 	X? (
-		virtual/x11
+		|| ( ( x11-libs/libXi
+				x11-libs/libXrender )
+			virtual/x11 )
 		=media-libs/freetype-2*
 	)
 	ggi? ( media-libs/libggi )
@@ -24,7 +26,12 @@ RDEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	sdl? ( >=media-libs/libsdl-1.1.8 )
 	ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	X? (
+		|| ( ( x11-libs/libXft
+				x11-libs/libXt )
+			virtual/x11 )
+	)"
 
 src_compile() {
 	sed -i -e 's:DSPF_RGB15:DSPF_ARGB1555:' src/gfx/drivers/directfb_driver.c
diff --git a/games-engines/freesci/freesci-0.6.1b.ebuild b/games-engines/freesci/freesci-0.6.1b.ebuild
index c46fddc54ed4..d317144b56e2 100644
--- a/games-engines/freesci/freesci-0.6.1b.ebuild
+++ b/games-engines/freesci/freesci-0.6.1b.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-engines/freesci/freesci-0.6.1b.ebuild,v 1.6 2005/04/15 04:05:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/freesci/freesci-0.6.1b.ebuild,v 1.7 2006/01/29 00:11:38 joshuabaergen Exp $
 
 inherit games
 
@@ -15,7 +15,9 @@ IUSE="X ggi directfb alsa sdl ncurses"
 
 RDEPEND="virtual/libc
 	X? (
-		virtual/x11
+		|| ( ( x11-libs/libXi
+				x11-libs/libXrender )
+			virtual/x11 )
 		=media-libs/freetype-2*
 	)
 	ggi? ( media-libs/libggi )
@@ -23,7 +25,12 @@ RDEPEND="virtual/libc
 	alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	sdl? ( >=media-libs/libsdl-1.1.8 )
 	ncurses? ( sys-libs/ncurses )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	X? (
+		|| ( ( x11-libs/libXft
+				x11-libs/libXt )
+			virtual/x11 )
+	)"
 
 src_unpack() {
 	unpack ${A}
diff --git a/games-engines/sarien/ChangeLog b/games-engines/sarien/ChangeLog
index ec8045eeb031..4dc9e2909e08 100644
--- a/games-engines/sarien/ChangeLog
+++ b/games-engines/sarien/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/sarien
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/sarien/ChangeLog,v 1.6 2004/12/28 17:17:21 josejx Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/sarien/ChangeLog,v 1.7 2006/01/29 00:11:39 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org>
+  sarien-0.7.0.ebuild:
+  Add modular X dependencies.
 
   29 Dec 2004; Joseph Jezak <josejx@gentoo.org> sarien-0.7.0.ebuild:
   Marked ppc stable.
diff --git a/games-engines/sarien/sarien-0.7.0.ebuild b/games-engines/sarien/sarien-0.7.0.ebuild
index 79a80ecb21d0..808781aa9317 100644
--- a/games-engines/sarien/sarien-0.7.0.ebuild
+++ b/games-engines/sarien/sarien-0.7.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-engines/sarien/sarien-0.7.0.ebuild,v 1.7 2004/12/28 17:17:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/sarien/sarien-0.7.0.ebuild,v 1.8 2006/01/29 00:11:39 joshuabaergen Exp $
 
 inherit games
 
@@ -14,8 +14,12 @@ KEYWORDS="x86 ppc ~amd64"
 IUSE=""
 
 RDEPEND="virtual/libc
-	virtual/x11"
+	|| ( x11-libs/libXext virtual/x11 )"
 DEPEND="${RDEPEND}
+	|| ( ( x11-proto/xextproto
+			x11-proto/xf86dgaproto
+			x11-proto/xf86vidmodeproto )
+		virtual/x11 )
 	>=sys-apps/sed-4"
 
 src_unpack() {
diff --git a/games-engines/zoom/ChangeLog b/games-engines/zoom/ChangeLog
index f3e9d72e55fc..2e3a70e26ee3 100644
--- a/games-engines/zoom/ChangeLog
+++ b/games-engines/zoom/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-engines/zoom
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/zoom/ChangeLog,v 1.10 2005/10/31 08:22:50 mr_bones_ Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/zoom/ChangeLog,v 1.11 2006/01/29 00:11:39 joshuabaergen Exp $
+
+  29 Jan 2006; Joshua Baergen <joshuabaergen@gentoo.org> zoom-1.0.3.ebuild,
+  zoom-1.0.4a.ebuild:
+  Add modular X dependencies.
 
 *zoom-1.0.4a (31 Oct 2005)
 
diff --git a/games-engines/zoom/zoom-1.0.3.ebuild b/games-engines/zoom/zoom-1.0.3.ebuild
index 8314f1990738..d376c587e523 100644
--- a/games-engines/zoom/zoom-1.0.3.ebuild
+++ b/games-engines/zoom/zoom-1.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-engines/zoom/zoom-1.0.3.ebuild,v 1.1 2005/10/10 15:05:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/zoom/zoom-1.0.3.ebuild,v 1.2 2006/01/29 00:11:39 joshuabaergen Exp $
 
 inherit flag-o-matic games
 
@@ -13,11 +13,14 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libSM
+				x11-libs/libXft )
+			virtual/x11 )
 	>=media-libs/t1lib-1.3.1
 	>=media-libs/libpng-1.2.4"
 DEPEND=">=sys-devel/bison-1.34
-	dev-lang/perl"
+	dev-lang/perl
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	filter-flags -ffast-math
diff --git a/games-engines/zoom/zoom-1.0.4a.ebuild b/games-engines/zoom/zoom-1.0.4a.ebuild
index e2b6bf0ad0db..79ce98a616f6 100644
--- a/games-engines/zoom/zoom-1.0.4a.ebuild
+++ b/games-engines/zoom/zoom-1.0.4a.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-engines/zoom/zoom-1.0.4a.ebuild,v 1.1 2005/10/31 08:22:50 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/zoom/zoom-1.0.4a.ebuild,v 1.2 2006/01/29 00:11:39 joshuabaergen Exp $
 
 inherit flag-o-matic games
 
@@ -13,14 +13,17 @@ SLOT="0"
 KEYWORDS="ppc x86"
 IUSE=""
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libSM
+				x11-libs/libXft )
+			virtual/x11 )
 	media-libs/fontconfig
 	>=media-libs/t1lib-1.3.1
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.4"
 DEPEND="${RDEPEND}
 	>=sys-devel/bison-1.34
-	dev-lang/perl"
+	dev-lang/perl
+	|| ( x11-proto/xextproto virtual/x11 )"
 
 src_compile() {
 	filter-flags -ffast-math