Fixed modular X dependencies for x86 and changed emul-linux-x86 libs to gtklibs for amd64. Closing bug #117375.

(Portage version: 2.1_pre3-r1)

3 files changed, 39 insertions, 20 deletions

diff --git a/app-emulation/vmware-workstation/ChangeLog b/app-emulation/vmware-workstation/ChangeLog
index e9e907b2aa8c..520e725f86d0 100644
--- a/app-emulation/vmware-workstation/ChangeLog
+++ b/app-emulation/vmware-workstation/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/vmware-workstation
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.115 2006/01/03 15:27:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.116 2006/01/04 21:59:43 wolf31o2 Exp $
+
+  04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  vmware-workstation-4.5.3.19414.ebuild,
+  vmware-workstation-5.5.1.19175.ebuild:
+  Fixed modular X dependencies for x86 and changed emul-linux-x86 libs to
+  gtklibs for amd64. Closing bug #117375.
 
 *vmware-workstation-4.5.3.19414 (03 Jan 2006)
 
diff --git a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414.ebuild b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414.ebuild
index ae9524f0022f..d62e76cd88e4 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414.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/vmware-workstation/vmware-workstation-4.5.3.19414.ebuild,v 1.1 2006/01/03 15:27:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-4.5.3.19414.ebuild,v 1.2 2006/01/04 21:59:43 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -35,15 +35,26 @@ SLOT="0"
 KEYWORDS="-* amd64 x86"
 RESTRICT="nostrip"
 
-DEPEND=">=dev-lang/perl-5
-	virtual/os-headers"
-
-RDEPEND=">=dev-lang/perl-5
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	sys-libs/glibc
-	virtual/x11
+DEPEND="virtual/os-headers"
+
+# vmware-workstation should not use virtual/libc as this is a
+# precompiled binary package thats linked to glibc.
+RDEPEND="sys-libs/glibc
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs )
+	x86? (
+		|| (
+			(
+				x11-libs/libXrandr
+				x11-libs/libXcursor
+				x11-libs/libXinerama
+				x11-libs/libXi )
+			virtual/x11 )
+		virtual/xft )
+	>=dev-lang/perl-5
 	!app-emulation/vmware-player
 	sys-apps/pciutils"
+#	>=sys-apps/baselayout-1.11.14"
 
 dir=/opt/vmware/workstation
 Ddir=${D}/${dir}
diff --git a/app-emulation/vmware-workstation/vmware-workstation-5.5.1.19175.ebuild b/app-emulation/vmware-workstation/vmware-workstation-5.5.1.19175.ebuild
index f46b583f18e5..fbdb68c2e126 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-5.5.1.19175.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-5.5.1.19175.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/vmware-workstation/vmware-workstation-5.5.1.19175.ebuild,v 1.3 2006/01/03 15:27:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/vmware-workstation-5.5.1.19175.ebuild,v 1.4 2006/01/04 21:59:43 wolf31o2 Exp $
 
 # Unlike many other binary packages the user doesn't need to agree to a licence
 # to download VMWare. The agreeing to a licence is part of the configure step
@@ -37,19 +37,21 @@ DEPEND="${RDEPEND} virtual/os-headers"
 # vmware-workstation should not use virtual/libc as this is a 
 # precompiled binary package thats linked to glibc.
 RDEPEND="sys-libs/glibc
-	amd64? ( app-emulation/emul-linux-x86-xlibs )
-	|| ( ( x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXinerama
-			x11-libs/libXi
-		)
-		virtual/x11
-	)
-	virtual/xft
+	amd64? (
+		app-emulation/emul-linux-x86-gtklibs )
+	x86? (
+		|| (
+			(
+				x11-libs/libXrandr
+				x11-libs/libXcursor
+				x11-libs/libXinerama
+				x11-libs/libXi )
+			virtual/x11 )
+		virtual/xft )
 	>=dev-lang/perl-5
 	!app-emulation/vmware-player
 	sys-apps/pciutils"
-#	>=sys-apps/baselayout-1.11.14
+#	>=sys-apps/baselayout-1.11.14"
 
 dir=/opt/vmware/workstation
 Ddir=${D}/${dir}