Alter the indentation and fix the modular X dependencies.

Package-Manager: portage-2.1.1_pre4-r1

3 files changed, 40 insertions, 34 deletions

diff --git a/app-emulation/vmware-server/ChangeLog b/app-emulation/vmware-server/ChangeLog
index 9f08e8c54fb3..37e64b26aac6 100644
--- a/app-emulation/vmware-server/ChangeLog
+++ b/app-emulation/vmware-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/vmware-server
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.1 2006/07/31 20:23:50 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.2 2006/07/31 21:24:30 ikelos Exp $
+
+  31 Jul 2006; Mike Auty <ikelos@gentoo.org>
+  vmware-server-1.0.0.28343.ebuild:
+  Alter the indentation and fix the modular X dependencies.
 
 *vmware-server-1.0.0.28343 (31 Jul 2006)
 
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index 0ac827b08ef1..a6a49d1b26d8 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -52,14 +52,14 @@ SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vm
 DIST VMware-server-1.0.0-28343.tar.gz 105298140 RMD160 ac3ba270717a18216c405d967f8535803ca68e3d SHA1 fc47b02b7bbb9fa793cc67f7b7a906448994a155 SHA256 c6583d04c083d54bdf74bc94705e0603c5d918df9756918d2053438d49c5641a
 DIST vmware-any-any-update101.tar.gz 296409 RMD160 d8994b91492257d8b8e08480ab27fc307fc34095 SHA1 43714052429c1574cdf086a052859657affff0b0 SHA256 b12e3a70117ef26a85c8e01a23ea7d21b62bbc86998368114f9f7932390d2037
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-EBUILD vmware-server-1.0.0.28343.ebuild 3067 RMD160 104f7f0a04836fbdc9280aa18c17ad1f7ea25ac2 SHA1 6b217ad00175d80bbff80841fa8899fdd4cf200a SHA256 cb98397d74035018e1020c9a9c2a8ccc7c24def51d7b2283b97a2f8f1a964c67
-MD5 3157498a404977e1c39b99c6a1fb4429 vmware-server-1.0.0.28343.ebuild 3067
-RMD160 104f7f0a04836fbdc9280aa18c17ad1f7ea25ac2 vmware-server-1.0.0.28343.ebuild 3067
-SHA256 cb98397d74035018e1020c9a9c2a8ccc7c24def51d7b2283b97a2f8f1a964c67 vmware-server-1.0.0.28343.ebuild 3067
-MISC ChangeLog 945 RMD160 3fa62b8f4e308d3b3928ac90c14fbebedc2e1927 SHA1 c1aed6a6c8646002f479b24e2612824b81be3a71 SHA256 fecece74de6edccce308b2b76ae45e95cb00fc4eaff3e438ea5f5f9732576104
-MD5 9d03026e998f2a8096f766d0ac8d9c58 ChangeLog 945
-RMD160 3fa62b8f4e308d3b3928ac90c14fbebedc2e1927 ChangeLog 945
-SHA256 fecece74de6edccce308b2b76ae45e95cb00fc4eaff3e438ea5f5f9732576104 ChangeLog 945
+EBUILD vmware-server-1.0.0.28343.ebuild 3047 RMD160 b8f1de64b2de917eb4da1ec69b95b993c6538468 SHA1 9c4a74783dc3ded3cac328b1f8262f14d7815ea2 SHA256 4b9a32091c9689c6c540794f3db8c4dea1d54b64340b6de6c82ff9c28a972b5b
+MD5 bec83f2c456cc796ef9ece0fca5a3c4c vmware-server-1.0.0.28343.ebuild 3047
+RMD160 b8f1de64b2de917eb4da1ec69b95b993c6538468 vmware-server-1.0.0.28343.ebuild 3047
+SHA256 4b9a32091c9689c6c540794f3db8c4dea1d54b64340b6de6c82ff9c28a972b5b vmware-server-1.0.0.28343.ebuild 3047
+MISC ChangeLog 1087 RMD160 0fae168885ba51d41071422a48c4e43ed2aeb089 SHA1 28ccb48a600c4553a800b7bd65fb27504a0ee992 SHA256 3933e09a89cf537a26b62be97e599a6dd6607a1d8809dee17f6063f4fa7296a8
+MD5 20dfb49653926ee0c4f5f6fc7df24ade ChangeLog 1087
+RMD160 0fae168885ba51d41071422a48c4e43ed2aeb089 ChangeLog 1087
+SHA256 3933e09a89cf537a26b62be97e599a6dd6607a1d8809dee17f6063f4fa7296a8 ChangeLog 1087
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
@@ -70,7 +70,7 @@ SHA256 238b459a2b88a29da621f150897d16f21f274be311f242e442ba39f6b516f772 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEzmbmu7rWomwgFXoRAkwnAKC23Uuz5n7eVQ2lIcaFU8wAT2L+tgCfatAE
-l2p74QJHAP39kH8K/d9wLxw=
-=2TS+
+iD8DBQFEznUou7rWomwgFXoRAs8AAJ95K8lT43p/fHQq4HOSksMwp/11PwCgs+5K
+2o+gVPiazzdzBx26xdaoMIA=
+=Nj8U
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.28343.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.28343.ebuild
index 8329dc2454bd..81756abb75ff 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.0.28343.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.0.28343.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-server/vmware-server-1.0.0.28343.ebuild,v 1.1 2006/07/31 20:23:50 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-1.0.0.28343.ebuild,v 1.2 2006/07/31 21:24:30 ikelos 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
@@ -14,12 +14,11 @@ MY_P="VMware-server-${MY_PV}"
 DESCRIPTION="VMware Server for Linux"
 HOMEPAGE="http://www.vmware.com/"
 SRC_URI="http://download3.vmware.com/software/vmserver/${MY_P}.tar.gz
-		 http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
-		 http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz
-		 http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-		 http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz
-		 http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2"
-
+		http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
+		http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz
+		http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
+		http://knihovny.cvut.cz/ftp/pub/vmware/obselete/${ANY_ANY}.tar.gz
+		http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2"
 
 LICENSE="vmware"
 IUSE=""
@@ -35,22 +34,25 @@ DEPEND=">=sys-libs/glibc-2.3.5
 # vmware-server 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-baselibs
-	         app-emulation/emul-linux-x86-gtklibs
-		   )
-	!amd64? ( || ( ( x11-libs/libX11
-			x11-libs/libXtst
-			x11-libs/libXext
-			x11-libs/libXt
-			x11-libs/libICE
-			x11-libs/libSM
-			x11-libs/libXrender
-		      )
-		      ( virtual/x11
+	amd64? (
+			app-emulation/emul-linux-x86-baselibs
+			app-emulation/emul-linux-x86-gtklibs
+	)
+	!amd64? (
 			virtual/xft
-		      )
-		    )
-	       )
+			|| (
+				(
+					x11-libs/libX11
+					x11-libs/libXtst
+					x11-libs/libXext
+					x11-libs/libXt
+					x11-libs/libICE
+					x11-libs/libSM
+					x11-libs/libXrender
+				)
+				virtual/x11
+			)
+	)
 	>=dev-lang/perl-5
 	!app-emulation/vmware-player
 	!app-emulation/vmware-workstation