Add support for modular X by Markus Ullmann #120287.

(Portage version: 2.1_pre3-r1)

7 files changed, 46 insertions, 22 deletions

diff --git a/app-emulation/crossover-office-bin/ChangeLog b/app-emulation/crossover-office-bin/ChangeLog
index 5ecd3fa3bae7..dd17e0528ae9 100644
--- a/app-emulation/crossover-office-bin/ChangeLog
+++ b/app-emulation/crossover-office-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/crossover-office-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.8 2006/01/15 19:08:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/ChangeLog,v 1.9 2006/01/25 22:54:18 vapier Exp $
+
+  25 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  crossover-office-bin-3.0.1.ebuild, crossover-office-bin-4.0.ebuild,
+  crossover-office-bin-4.1.ebuild, crossover-office-bin-4.2.ebuild,
+  crossover-office-bin-5.0.0.ebuild, crossover-office-bin-5.0.1.ebuild:
+  Add support for modular X by Markus Ullmann #120287.
 
 *crossover-office-bin-5.0.1 (15 Jan 2006)
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild
index 4a7203f60cbc..3cf1cd9d8680 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-3.0.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/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild,v 1.5 2006/01/06 22:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-3.0.1.ebuild,v 1.6 2006/01/25 22:54:18 vapier Exp $
 
 inherit eutils
 
@@ -14,9 +14,12 @@ KEYWORDS="-* ~x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="virtual/x11
-	nas? ( media-libs/nas )
-	sys-libs/glibc"
+RDEPEND="sys-libs/glibc
+	|| (
+		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
+		virtual/x11
+	)
+	nas? ( media-libs/nas )"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild
index 3f6e7c324702..25483579b5f0 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-4.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/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild,v 1.5 2006/01/06 22:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.0.ebuild,v 1.6 2006/01/25 22:54:18 vapier Exp $
 
 inherit eutils
 
@@ -14,9 +14,12 @@ KEYWORDS="-* ~x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="virtual/x11
-	nas? ( media-libs/nas )
-	sys-libs/glibc"
+RDEPEND="sys-libs/glibc
+	|| (
+		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
+		virtual/x11
+	)
+	nas? ( media-libs/nas )"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild
index 84838331aacb..bf599a40ea33 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-4.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/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild,v 1.6 2006/01/06 22:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.1.ebuild,v 1.7 2006/01/25 22:54:18 vapier Exp $
 
 inherit eutils
 
@@ -14,9 +14,12 @@ KEYWORDS="-* ~x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="virtual/x11
-	nas? ( media-libs/nas )
-	sys-libs/glibc"
+RDEPEND="sys-libs/glibc
+	|| (
+		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
+		virtual/x11
+	)
+	nas? ( media-libs/nas )"
 
 S=${WORKDIR}
 
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild
index 2478ea436f09..fba86a1eaa74 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-4.2.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/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild,v 1.5 2006/01/06 22:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-4.2.ebuild,v 1.6 2006/01/25 22:54:18 vapier Exp $
 
 inherit eutils
 
@@ -14,9 +14,12 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="virtual/x11
+RDEPEND="sys-libs/glibc
+	|| (
+		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
+		virtual/x11
+	)
 	nas? ( media-libs/nas )
-	sys-libs/glibc
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild
index 4cddd3bfc515..fcbddea9d4f8 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.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/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild,v 1.4 2006/01/06 22:38:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.0.ebuild,v 1.5 2006/01/25 22:54:18 vapier Exp $
 
 inherit eutils
 
@@ -14,9 +14,12 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="virtual/x11
+RDEPEND="sys-libs/glibc
+	|| (
+		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
+		virtual/x11
+	)
 	nas? ( media-libs/nas )
-	sys-libs/glibc
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
 S=${WORKDIR}
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild
index 6d573a0ccb39..0df6089acc44 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-5.0.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/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild,v 1.1 2006/01/15 19:08:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-office-bin/crossover-office-bin-5.0.1.ebuild,v 1.2 2006/01/25 22:54:18 vapier Exp $
 
 inherit eutils
 
@@ -14,9 +14,12 @@ KEYWORDS="-* ~amd64 ~x86"
 IUSE="nas"
 RESTRICT="fetch nostrip"
 
-RDEPEND="virtual/x11
+RDEPEND="sys-libs/glibc
+	|| (
+		( x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXmu x11-libs/libXxf86dga x11-libs/libXxf86vm )
+		virtual/x11
+	)
 	nas? ( media-libs/nas )
-	sys-libs/glibc
 	amd64? ( app-emulation/emul-linux-x86-xlibs )"
 
 S=${WORKDIR}