Resync with the main tree, to pull in QA fixes.

Also include a fix for bug 178562.

svn path=/trunk/; revision=194

1 files changed, 24 insertions, 29 deletions

diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild
index 75728c4..daa41ac 100644
--- a/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild
+++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild,v 1.1 2007/05/07 17:58:12 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server-console/vmware-server-console-1.0.3.44356.ebuild,v 1.4 2007/07/22 09:38:14 omp 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
@@ -26,39 +26,34 @@ LICENSE="vmware"
 IUSE=""
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="nostrip"
+RESTRICT="strip"
 
 DEPEND=">=sys-libs/glibc-2.3.5
-		virtual/os-headers
-		>=dev-lang/perl-5
-		>=sys-apps/portage-2.0.54
-		app-arch/unzip"
+	virtual/os-headers
+	>=dev-lang/perl-5
+	>=sys-apps/portage-2.0.54
+	app-arch/unzip"
 
-# vmware-server-console should not use virtual/libc as this is a 
+# vmware-server-console should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND=">=sys-libs/glibc-2.3.5
-		 amd64? ( app-emulation/emul-linux-x86-gtklibs )
-		 !amd64? ( || ( ( x11-libs/libSM
-						 x11-libs/libICE
-						 x11-libs/libX11
-						 x11-libs/libXau
-						 x11-libs/libXcursor
-						 x11-libs/libXdmcp
-						 x11-libs/libXext
-						 x11-libs/libXfixes
-						 x11-libs/libXft
-						 x11-libs/libXi
-						 x11-libs/libXrandr
-						 x11-libs/libXrender
-						 x11-libs/libXt
-						 x11-libs/libXtst
-	     	  		   )
-			  		   virtual/x11
-	        		 )
-				)
-		 >=dev-lang/perl-5
-		 !<sys-apps/dbus-0.62
-		 "
+	amd64? ( app-emulation/emul-linux-x86-gtklibs )
+	!amd64? ( x11-libs/libSM
+		x11-libs/libICE
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libXcursor
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXft
+		x11-libs/libXi
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXtst )
+	>=dev-lang/perl-5
+	!<sys-apps/dbus-0.62"
 
 etcdir="/etc/${PN}"
 ANY_ANY=""