Add support for modular X #121500.

(Portage version: 2.1_pre4-r1)

16 files changed, 55 insertions, 47 deletions

diff --git a/app-emulation/cedega/ChangeLog b/app-emulation/cedega/ChangeLog
index 1df932581ba5..97b15282c32c 100644
--- a/app-emulation/cedega/ChangeLog
+++ b/app-emulation/cedega/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/cedega
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/ChangeLog,v 1.21 2005/11/13 22:28:28 vapier Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/ChangeLog,v 1.22 2006/02/11 05:41:53 vapier Exp $
+
+  11 Feb 2006; Mike Frysinger <vapier@gentoo.org> cedega-4.0.ebuild,
+  cedega-4.0.1.ebuild, cedega-4.1.ebuild, cedega-4.1.1.ebuild,
+  cedega-4.2-r1.ebuild, cedega-4.2.1.ebuild, cedega-4.3.ebuild,
+  cedega-4.3.1.ebuild, cedega-4.3.2.ebuild, cedega-4.4.ebuild,
+  cedega-4.4.1.ebuild, cedega-4.4.2.ebuild, cedega-4.4.3.ebuild,
+  cedega-5.0.ebuild, cedega-5.0.1.ebuild:
+  Add support for modular X #121500.
 
 *cedega-5.0.1 (13 Nov 2005)
 
diff --git a/app-emulation/cedega/cedega-4.0.1.ebuild b/app-emulation/cedega/cedega-4.0.1.ebuild
index 24f3116b102e..4e93dd939e90 100644
--- a/app-emulation/cedega/cedega-4.0.1.ebuild
+++ b/app-emulation/cedega/cedega-4.0.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/app-emulation/cedega/cedega-4.0.1.ebuild,v 1.10 2005/01/12 00:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.0.1.ebuild,v 1.11 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.0.ebuild b/app-emulation/cedega/cedega-4.0.ebuild
index 7a5da3dd2942..3b4685ff0abd 100644
--- a/app-emulation/cedega/cedega-4.0.ebuild
+++ b/app-emulation/cedega/cedega-4.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/app-emulation/cedega/cedega-4.0.ebuild,v 1.8 2005/01/12 00:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.0.ebuild,v 1.9 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.1.1.ebuild b/app-emulation/cedega/cedega-4.1.1.ebuild
index fb2159f9d77d..e83c3fad6d48 100644
--- a/app-emulation/cedega/cedega-4.1.1.ebuild
+++ b/app-emulation/cedega/cedega-4.1.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/app-emulation/cedega/cedega-4.1.1.ebuild,v 1.3 2005/01/12 00:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.1.1.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.1.ebuild b/app-emulation/cedega/cedega-4.1.ebuild
index 648d55fda23d..c58f5759f52e 100644
--- a/app-emulation/cedega/cedega-4.1.ebuild
+++ b/app-emulation/cedega/cedega-4.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/app-emulation/cedega/cedega-4.1.ebuild,v 1.4 2005/01/12 00:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.1.ebuild,v 1.5 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.2-r1.ebuild b/app-emulation/cedega/cedega-4.2-r1.ebuild
index 7f04cc4220d8..54f9e0419f11 100644
--- a/app-emulation/cedega/cedega-4.2-r1.ebuild
+++ b/app-emulation/cedega/cedega-4.2-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/app-emulation/cedega/cedega-4.2-r1.ebuild,v 1.3 2005/01/12 00:10:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.2-r1.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}ForSteam-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.2.1.ebuild b/app-emulation/cedega/cedega-4.2.1.ebuild
index 289e2a699f56..36e572bd4ffc 100644
--- a/app-emulation/cedega/cedega-4.2.1.ebuild
+++ b/app-emulation/cedega/cedega-4.2.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/app-emulation/cedega/cedega-4.2.1.ebuild,v 1.3 2005/09/03 22:07:11 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.2.1.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.3.1.ebuild b/app-emulation/cedega/cedega-4.3.1.ebuild
index a8497c5ca8e5..660ab898a622 100644
--- a/app-emulation/cedega/cedega-4.3.1.ebuild
+++ b/app-emulation/cedega/cedega-4.3.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/app-emulation/cedega/cedega-4.3.1.ebuild,v 1.3 2005/09/03 22:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.3.1.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.3.2.ebuild b/app-emulation/cedega/cedega-4.3.2.ebuild
index b0312452ee3c..1a9607b9dfaf 100644
--- a/app-emulation/cedega/cedega-4.3.2.ebuild
+++ b/app-emulation/cedega/cedega-4.3.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/app-emulation/cedega/cedega-4.3.2.ebuild,v 1.3 2005/09/03 22:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.3.2.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.3.ebuild b/app-emulation/cedega/cedega-4.3.ebuild
index fed4f32627fc..33958caba501 100644
--- a/app-emulation/cedega/cedega-4.3.ebuild
+++ b/app-emulation/cedega/cedega-4.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/app-emulation/cedega/cedega-4.3.ebuild,v 1.3 2005/09/03 22:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.3.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.4.1.ebuild b/app-emulation/cedega/cedega-4.4.1.ebuild
index 99b16aa674f0..11074ba896a2 100644
--- a/app-emulation/cedega/cedega-4.4.1.ebuild
+++ b/app-emulation/cedega/cedega-4.4.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/app-emulation/cedega/cedega-4.4.1.ebuild,v 1.3 2005/09/03 22:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.4.1.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.4.2.ebuild b/app-emulation/cedega/cedega-4.4.2.ebuild
index e0d174e636c7..e97f0082520f 100644
--- a/app-emulation/cedega/cedega-4.4.2.ebuild
+++ b/app-emulation/cedega/cedega-4.4.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/app-emulation/cedega/cedega-4.4.2.ebuild,v 1.1 2005/10/12 23:04:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.4.2.ebuild,v 1.2 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.4.3.ebuild b/app-emulation/cedega/cedega-4.4.3.ebuild
index 808b8362797d..919bf0867e57 100644
--- a/app-emulation/cedega/cedega-4.4.3.ebuild
+++ b/app-emulation/cedega/cedega-4.4.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/app-emulation/cedega/cedega-4.4.3.ebuild,v 1.1 2005/10/13 00:14:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.4.3.ebuild,v 1.2 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-4.4.ebuild b/app-emulation/cedega/cedega-4.4.ebuild
index 6dfe0f0f0513..d2cb37c0fa2f 100644
--- a/app-emulation/cedega/cedega-4.4.ebuild
+++ b/app-emulation/cedega/cedega-4.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/app-emulation/cedega/cedega-4.4.ebuild,v 1.3 2005/09/03 22:08:26 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-4.4.ebuild,v 1.4 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega_${PV}-1.i386"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-5.0.1.ebuild b/app-emulation/cedega/cedega-5.0.1.ebuild
index 79548ffc5025..3faaf511c2a8 100644
--- a/app-emulation/cedega/cedega-5.0.1.ebuild
+++ b/app-emulation/cedega/cedega-5.0.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/app-emulation/cedega/cedega-5.0.1.ebuild,v 1.1 2005/11/13 22:28:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-5.0.1.ebuild,v 1.2 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega-small-${PV}"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )
diff --git a/app-emulation/cedega/cedega-5.0.ebuild b/app-emulation/cedega/cedega-5.0.ebuild
index f96dec86bc8c..f277b3c46b11 100644
--- a/app-emulation/cedega/cedega-5.0.ebuild
+++ b/app-emulation/cedega/cedega-5.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/app-emulation/cedega/cedega-5.0.ebuild,v 1.1 2005/11/09 01:14:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cedega/cedega-5.0.ebuild,v 1.2 2006/02/11 05:41:53 vapier Exp $
 
 MY_P="cedega-small-${PV}"
 DESCRIPTION="Cedega replaces WineX, a distribution of Wine with enhanced DirectX for gaming"
@@ -13,7 +13,7 @@ KEYWORDS="-* amd64 x86"
 IUSE="cups opengl"
 RESTRICT="fetch"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11 ) virtual/x11 )
 	opengl? ( virtual/opengl )
 	>=sys-libs/ncurses-5.2
 	cups? ( net-print/cups )