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

Also include a fix for bug 178562.

svn path=/trunk/; revision=194

19 files changed, 104 insertions, 99 deletions

diff --git a/ChangeLog b/ChangeLog
index e989e48..1112619 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $ Id: $
 
+  28 Jul 2007; Mike Auty <ikelos@gentoo.org>:
+  Big re-sync with the main tree.
+  Hopefully baselayout-2 rc's are still here, but not in the tree.
+  Also added a minor fix for bug 178562.
+  
   26 Jul 2007; Mike Auty <ikelos@gentoo.org>:
   Bumped any-any *again*, let's hope this one works.
 
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 69f79bd..a9f1cda 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -13,22 +13,22 @@ SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 files/pa
 DIST VMware-player-2.0.0-45731.i386.tar.gz 66424421 RMD160 185c262e179af9cb911bfd364f063ca39a0575f5 SHA1 918ea59c3315a520ac9bd99150a1d91d958c6b9b SHA256 25a1d33f1ce50a88f046274f0499f83ab27a42c838cc552b884127d5b3701e40
 DIST VMware-player-2.0.0-45731.x86_64.tar.gz 32364670 RMD160 75a3f45b68e62d1501b5ac8359805e2499d37b33 SHA1 3a33f5a913fafd6f9e0cad6df2dfa2b3d1f51579 SHA256 52ce69de70c0f55e9f95b03a9d397276236dd133e5ea5c616304220444d6e8b1
 DIST vmware-any-any-update112.tar.gz 469362 RMD160 380bd15513583055cf0810c16ae11642454fafd3 SHA1 8d583e3779950362c1e07c5fb839f77a45a2d3ca SHA256 f6da5636812cdb72cc8036da2f23df1abe6dbe7714c029f89ad3f042b092abb2
-EBUILD vmware-modules-1.0.0.11-r1.ebuild 311 RMD160 c1022016ab270313119855fe76745f9e5411ef26 SHA1 3f4408471a775cc68d2401808f2b8bec4f950cd7 SHA256 7a8c427e8c4c55feb3ff87d7085938373bd9154e771cc8ba2ee969eb0cd771cb
-MD5 707b0a7edf016c7b3fc187f43b1f17c5 vmware-modules-1.0.0.11-r1.ebuild 311
-RMD160 c1022016ab270313119855fe76745f9e5411ef26 vmware-modules-1.0.0.11-r1.ebuild 311
-SHA256 7a8c427e8c4c55feb3ff87d7085938373bd9154e771cc8ba2ee969eb0cd771cb vmware-modules-1.0.0.11-r1.ebuild 311
-EBUILD vmware-modules-1.0.0.13-r1.ebuild 310 RMD160 f62cdea2cbe3c7cd5abbc5a8bdbaa98273ed2ae0 SHA1 390c178f3d494ff649ab5ffb15cd550b15a25c09 SHA256 c6913e7173bdb5a4bc062c282c54abc4db80acc0d52e2de2085d1acf50adda70
-MD5 e6b48118a759ba457feac0c5313efd77 vmware-modules-1.0.0.13-r1.ebuild 310
-RMD160 f62cdea2cbe3c7cd5abbc5a8bdbaa98273ed2ae0 vmware-modules-1.0.0.13-r1.ebuild 310
-SHA256 c6913e7173bdb5a4bc062c282c54abc4db80acc0d52e2de2085d1acf50adda70 vmware-modules-1.0.0.13-r1.ebuild 310
-EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 afaf3eb4ce4a7accb66ea72aded5d4d40d893b42 SHA1 75d1b8d20adfa705d3031829808d7097c1137cd4 SHA256 a3165f3d4a5c7092903f941ed040579db0db1be115b874b058ac5c346c073b8a
-MD5 fcd4681d786c043ac64ac0f80bf93400 vmware-modules-1.0.0.15-r1.ebuild 311
-RMD160 afaf3eb4ce4a7accb66ea72aded5d4d40d893b42 vmware-modules-1.0.0.15-r1.ebuild 311
-SHA256 a3165f3d4a5c7092903f941ed040579db0db1be115b874b058ac5c346c073b8a vmware-modules-1.0.0.15-r1.ebuild 311
-EBUILD vmware-modules-1.0.0.16.ebuild 743 RMD160 ef87bb3cfa5f7ed31edb320209d0dc78841d5a2d SHA1 d3fd5386b6147f75fc23c5e4c0988029537abf6d SHA256 facb74d40da947ca7903506c18b704dc312b06e7945284f4ed72ac68ede54ff4
-MD5 5123540773a4887bdc6161bd3e36e02b vmware-modules-1.0.0.16.ebuild 743
-RMD160 ef87bb3cfa5f7ed31edb320209d0dc78841d5a2d vmware-modules-1.0.0.16.ebuild 743
-SHA256 facb74d40da947ca7903506c18b704dc312b06e7945284f4ed72ac68ede54ff4 vmware-modules-1.0.0.16.ebuild 743
+EBUILD vmware-modules-1.0.0.11-r1.ebuild 310 RMD160 7748b52659054c3b5b29181cbb35083eee30158a SHA1 7f20b5bb8808761897ccc8c395f6ee3e9d10065e SHA256 e897d58dd5b68ede4c58f02d2702dcdd0b85b16726bd8b4ec04e28a73ada8b7f
+MD5 20e6449837fa96d4d4b21fa5a356fb72 vmware-modules-1.0.0.11-r1.ebuild 310
+RMD160 7748b52659054c3b5b29181cbb35083eee30158a vmware-modules-1.0.0.11-r1.ebuild 310
+SHA256 e897d58dd5b68ede4c58f02d2702dcdd0b85b16726bd8b4ec04e28a73ada8b7f vmware-modules-1.0.0.11-r1.ebuild 310
+EBUILD vmware-modules-1.0.0.13-r1.ebuild 309 RMD160 5e9267a28aaa0c36a61afc38110dd8f29f5f0df2 SHA1 7145a3756274c6617de84c058d79ebe77b2a637c SHA256 4a394b382a44026957253b802c2be37ccfd980048b7e68e344859861ad292d5f
+MD5 e55094bb14da9fcf22ec8f9cd12186b7 vmware-modules-1.0.0.13-r1.ebuild 309
+RMD160 5e9267a28aaa0c36a61afc38110dd8f29f5f0df2 vmware-modules-1.0.0.13-r1.ebuild 309
+SHA256 4a394b382a44026957253b802c2be37ccfd980048b7e68e344859861ad292d5f vmware-modules-1.0.0.13-r1.ebuild 309
+EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7
+MD5 964d9f1e9e7d1a59b8b3a2819c2da791 vmware-modules-1.0.0.15-r1.ebuild 311
+RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a vmware-modules-1.0.0.15-r1.ebuild 311
+SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7 vmware-modules-1.0.0.15-r1.ebuild 311
+EBUILD vmware-modules-1.0.0.16.ebuild 737 RMD160 cdea8d928dc89096f890c66ee1aa38dea2b9e70c SHA1 46499f8baa289e9f94995f5495718550294fa94e SHA256 23ad6db3e3431421cb70713ddc093caa0617581d29f1b740aa4eb033d5f9842c
+MD5 86cd830214fafbaa6e12a20a342a273a vmware-modules-1.0.0.16.ebuild 737
+RMD160 cdea8d928dc89096f890c66ee1aa38dea2b9e70c vmware-modules-1.0.0.16.ebuild 737
+SHA256 23ad6db3e3431421cb70713ddc093caa0617581d29f1b740aa4eb033d5f9842c vmware-modules-1.0.0.16.ebuild 737
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.11-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.11-r1.ebuild
index d4ebd05..70a7c74 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.11-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.11-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.11-r1.ebuild,v 1.1 2006/10/17 09:21:11 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.11-r1.ebuild,v 1.3 2007/07/12 23:44:54 wolf31o2 Exp $
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 VMWARE_VER="VME_V452"
 
 inherit vmware-mod
-
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.13-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.13-r1.ebuild
index 10aa28c..b6ecc25 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.13-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.13-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.13-r1.ebuild,v 1.1 2006/10/17 09:21:11 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.13-r1.ebuild,v 1.3 2007/07/12 23:44:54 wolf31o2 Exp $
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 VMWARE_VER="VME_V55"
 
 inherit vmware-mod
-
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild
index 0c7d4b6..1c8274e 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild,v 1.1 2006/10/17 09:21:11 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild,v 1.4 2007/07/12 06:39:56 mr_bones_ Exp $
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 VMWARE_VER="VME_S1B1"
 
 inherit vmware-mod
-
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild
index 4a24e33..f0698e3 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.15-r1.ebuild,v 1.1 2006/10/17 09:21:11 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild,v 1.2 2007/07/12 06:39:56 mr_bones_ Exp $
 
 KEYWORDS="-* ~amd64 ~x86"
 VMWARE_VER="VME_V6" # THIS VALUE IS JUST A PLACE HOLDER
@@ -9,7 +9,7 @@ inherit eutils vmware-mod
 
 VMWARE_MODULE_LIST="vmmon vmnet vmblock"
 SRC_URI="x86? ( mirror://vmware/software/vmplayer/VMware-player-2.0.0-45731.i386.tar.gz )
-         amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.0-45731.x86_64.tar.gz )"
+		 amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.0-45731.x86_64.tar.gz )"
 VMWARE_MOD_DIR="vmware-player-distrib/lib/modules/source/"
 
 src_unpack() {
diff --git a/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild b/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild
index 1b012b4..21d9081 100644
--- a/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild
+++ b/app-emulation/vmware-player/vmware-player-2.0.0.45731.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-player/vmware-player-1.0.3.34682.ebuild,v 1.1 2006/12/14 18:38:51 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.0.0.45731.ebuild,v 1.4 2007/07/13 00:36:15 wolf31o2 Exp $
 
 inherit versionator eutils vmware
 
@@ -31,7 +31,7 @@ S=${WORKDIR}/vmware-player-distrib
 
 DEPEND="${RDEPEND} virtual/os-headers
 	!app-emulation/vmware-workstation"
-# vmware-player should not use virtual/libc as this is a 
+# vmware-player should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="sys-libs/glibc
 	amd64? (
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=""
diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest
index f88647c..7910c48 100644
--- a/app-emulation/vmware-server/Manifest
+++ b/app-emulation/vmware-server/Manifest
@@ -51,10 +51,10 @@ DIST vmware-any-any-update112.tar.gz 469362 RMD160 380bd15513583055cf0810c16ae11
 DIST vmware-libcrypto.so.0.9.7l.tar.bz2 412159 RMD160 89282ae9fc6e8921a47704bc9cd23cf70a6870e8 SHA1 f86c4cb076fe1764975e9243dc0fae763f2b589a SHA256 fae52acf61415959cca763a715a2b61ec49f161a416d418d6a1faffce531db12
 DIST vmware-libssl.so.0.9.7l.tar.bz2 78244 RMD160 195dd4808e60f81621e6ed12b843ded49c0fa747 SHA1 5fe729a1e49e77afd83b408845833174e1296e39 SHA256 3e1e13196066dc5b77d3ef6b5df55a29156eba1f39661e40cd617b538220d089
 DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
-EBUILD vmware-server-1.0.3.44356.ebuild 3515 RMD160 7791d723dc4558c7550c11a9e743eb026062c839 SHA1 d5f6b57609faf62c6521868c95eed312e968b0b7 SHA256 de5e42b230cf2c5840b35161ee7fff2c1b77f7905313a3d7c5b50a01603ff137
-MD5 b664d9eeab46a7fd10b1c344ed8a7fb5 vmware-server-1.0.3.44356.ebuild 3515
-RMD160 7791d723dc4558c7550c11a9e743eb026062c839 vmware-server-1.0.3.44356.ebuild 3515
-SHA256 de5e42b230cf2c5840b35161ee7fff2c1b77f7905313a3d7c5b50a01603ff137 vmware-server-1.0.3.44356.ebuild 3515
+EBUILD vmware-server-1.0.3.44356.ebuild 3601 RMD160 cf9363f85ec04709f16b607df1b6e2101c97189a SHA1 e14dc56f7c1c26ca6f5652133e86d35e9b57aa3a SHA256 7fdc4a5adc0095ff49671ccef9ba9f63de6affd91a227c91c82738414a6463cc
+MD5 6deb79e0769cc26f6cfcf2d87589bf7b vmware-server-1.0.3.44356.ebuild 3601
+RMD160 cf9363f85ec04709f16b607df1b6e2101c97189a vmware-server-1.0.3.44356.ebuild 3601
+SHA256 7fdc4a5adc0095ff49671ccef9ba9f63de6affd91a227c91c82738414a6463cc vmware-server-1.0.3.44356.ebuild 3601
 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215
 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159
 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159
diff --git a/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild b/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild
index 844e819..29ab345 100644
--- a/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild
+++ b/app-emulation/vmware-server/vmware-server-1.0.3.44356.ebuild
@@ -58,6 +58,8 @@ RDEPEND=">=sys-libs/glibc-2.3.5
 	!app-emulation/vmware-player
 	!app-emulation/vmware-workstation
 	~app-emulation/vmware-modules-1.0.0.15
+    !<app-emulation/vmware-modules-1.0.0.15
+	!>=app-emulation/vmware-modules-1.0.0.16
 	sys-apps/pciutils
 	virtual/pam
 	sys-apps/xinetd"
diff --git a/app-emulation/vmware-workstation-tools/Manifest b/app-emulation/vmware-workstation-tools/Manifest
index 218eddd..0656d9b 100644
--- a/app-emulation/vmware-workstation-tools/Manifest
+++ b/app-emulation/vmware-workstation-tools/Manifest
@@ -22,19 +22,19 @@ AUX patches/000_all_makefile-include-directory.patch 343 RMD160 d2f63ede9d9dbc6e
 MD5 b90ff7e76d6c548c562b6bb276ad28ae files/patches/000_all_makefile-include-directory.patch 343
 RMD160 d2f63ede9d9dbc6ec94ccede9177a5a15a678e62 files/patches/000_all_makefile-include-directory.patch 343
 SHA256 fadf02891dd78611790f6b59c2ba7ec5aaaa9767bbe779d97e6c3b38aaaa7b94 files/patches/000_all_makefile-include-directory.patch 343
-AUX vmware-workstation-tools 1984 RMD160 c28a4b43a6b22eab71a387e9a9c55355ae6a3d48 SHA1 a2b16a6fa0f1740aba11ce60577e92ea48db6a95 SHA256 fef4a2931213c693dc9f74ec69d4277c6e0d71e13007ca034e2f8c8e218fd83a
-MD5 598ef875b1413f773a405652c681b39b files/vmware-workstation-tools 1984
-RMD160 c28a4b43a6b22eab71a387e9a9c55355ae6a3d48 files/vmware-workstation-tools 1984
-SHA256 fef4a2931213c693dc9f74ec69d4277c6e0d71e13007ca034e2f8c8e218fd83a files/vmware-workstation-tools 1984
-AUX vmware-workstation-tools.rc 1451 RMD160 b387496a3831131b0a38754b937a39969b67e818 SHA1 bb15fe8980092705a6eeda5ffac5635d31a0a4ab SHA256 916630e91658ef577ee572844a435d7d858cd909a90252bfec3eba121a6f0eec
-MD5 8b22698ac50d0e13b492c277fb697b62 files/vmware-workstation-tools.rc 1451
-RMD160 b387496a3831131b0a38754b937a39969b67e818 files/vmware-workstation-tools.rc 1451
-SHA256 916630e91658ef577ee572844a435d7d858cd909a90252bfec3eba121a6f0eec files/vmware-workstation-tools.rc 1451
+AUX vmware-workstation-tools 1978 RMD160 a4bdc439c5c395d78c6055169138dfe4c0f8bad3 SHA1 ff117bfa2c914f0f699e11a1e3559776fc68685d SHA256 b347596ce3ccb667ed9c8fa020d7dbe3ac06f036dd53aefac4e4ed104a020c01
+MD5 cd8000681b811c7e3e41c2646532a9b9 files/vmware-workstation-tools 1978
+RMD160 a4bdc439c5c395d78c6055169138dfe4c0f8bad3 files/vmware-workstation-tools 1978
+SHA256 b347596ce3ccb667ed9c8fa020d7dbe3ac06f036dd53aefac4e4ed104a020c01 files/vmware-workstation-tools 1978
+AUX vmware-workstation-tools.rc 1473 RMD160 1b69ea1009cfc470d1368c216a69407a09fbf4ab SHA1 39c084e3c555ad5c4a990132f4de673e1ac3d2d1 SHA256 67d069369b279602adf028cd66fd1d1c5612bc8b17f9d405be62e284b2f50be3
+MD5 14ed3ffa9feacd1f7258d23132862674 files/vmware-workstation-tools.rc 1473
+RMD160 1b69ea1009cfc470d1368c216a69407a09fbf4ab files/vmware-workstation-tools.rc 1473
+SHA256 67d069369b279602adf028cd66fd1d1c5612bc8b17f9d405be62e284b2f50be3 files/vmware-workstation-tools.rc 1473
 AUX xorg.conf 2646 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 SHA1 a44f4240f19390a6707da4313139160ee6972da0 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8
 MD5 bd0505ab92d03f82b898858d45787f58 files/xorg.conf 2646
 RMD160 c3e2e153b3b9520fc8d5fa20e9e8f7a6c3790084 files/xorg.conf 2646
 SHA256 2503352f7fd53f23e51d53017f76167a2da0fdfbb9eb434c85573108c6bc53c8 files/xorg.conf 2646
-DIST vmware-any-any-update110.tar.gz 328695 RMD160 eb2e8adc6a7993e2faa6f239e090c0586079fbe7 SHA1 959d39f35bd5a59565150988f9826e9e4c19bbce SHA256 794bf95266e218afad045edfb82deeefaa6338942e6da961e3f23457ecfdcd5a
+DIST vmware-any-any-update112.tar.gz 469362 RMD160 380bd15513583055cf0810c16ae11642454fafd3 SHA1 8d583e3779950362c1e07c5fb839f77a45a2d3ca SHA256 f6da5636812cdb72cc8036da2f23df1abe6dbe7714c029f89ad3f042b092abb2
 EBUILD vmware-workstation-tools-4.5.3-r1.ebuild 2262 RMD160 24586a04750ef86ae3af3d853342b7e13bb9bf6d SHA1 cee96b775e19bb386494d8f27e6ee699db274891 SHA256 af94a1aee87959fbee99e2ac7b6ad898a312f20290c110857de0bcb76f1fd80f
 MD5 9b784c69da55ae066450f13ad163281a vmware-workstation-tools-4.5.3-r1.ebuild 2262
 RMD160 24586a04750ef86ae3af3d853342b7e13bb9bf6d vmware-workstation-tools-4.5.3-r1.ebuild 2262
@@ -55,9 +55,9 @@ EBUILD vmware-workstation-tools-6.0.0.45731.ebuild 1249 RMD160 cc56bf9217d7beece
 MD5 c48f5e984d800107e36e33eb66039fd3 vmware-workstation-tools-6.0.0.45731.ebuild 1249
 RMD160 cc56bf9217d7beece1b228db627ab6b2b1ae41c9 vmware-workstation-tools-6.0.0.45731.ebuild 1249
 SHA256 ba5ab5e48215094f264163019b0be8f6126fc21200787a40b5f00fbd0a9654d9 vmware-workstation-tools-6.0.0.45731.ebuild 1249
-MD5 edf912a530b6fb4eb8b461da2e390fba files/digest-vmware-workstation-tools-4.5.3-r1 274
-RMD160 d272a91b868fec7c70d83f28c397ace634e3eb71 files/digest-vmware-workstation-tools-4.5.3-r1 274
-SHA256 10ed015ac310cb705126ae22728e089bf65979ea864d0ff943b318d1aa9f440c files/digest-vmware-workstation-tools-4.5.3-r1 274
+MD5 c2bbeab719f7cf63c26e23767d4cb53b files/digest-vmware-workstation-tools-4.5.3-r1 274
+RMD160 059487f89566ff382d87c29ee1299e9398ca292b files/digest-vmware-workstation-tools-4.5.3-r1 274
+SHA256 8f9d468557f995c1d08b41506224f72fb1360db1bc3fa88b04688d6fcf67024e files/digest-vmware-workstation-tools-4.5.3-r1 274
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-vmware-workstation-tools-5.5.1-r2 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-vmware-workstation-tools-5.5.1-r2 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-vmware-workstation-tools-5.5.1-r2 0
diff --git a/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1 b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1
index 4e51f77..54a6da4 100644
--- a/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1
+++ b/app-emulation/vmware-workstation-tools/files/digest-vmware-workstation-tools-4.5.3-r1
@@ -1,3 +1,3 @@
-MD5 6a0c8da95b4c25670c842939e5b92728 vmware-any-any-update110.tar.gz 328695
-RMD160 eb2e8adc6a7993e2faa6f239e090c0586079fbe7 vmware-any-any-update110.tar.gz 328695
-SHA256 794bf95266e218afad045edfb82deeefaa6338942e6da961e3f23457ecfdcd5a vmware-any-any-update110.tar.gz 328695
+MD5 fc25f970aa2797938b54f3d2a7ec2d73 vmware-any-any-update112.tar.gz 469362
+RMD160 380bd15513583055cf0810c16ae11642454fafd3 vmware-any-any-update112.tar.gz 469362
+SHA256 f6da5636812cdb72cc8036da2f23df1abe6dbe7714c029f89ad3f042b092abb2 vmware-any-any-update112.tar.gz 469362
diff --git a/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools b/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools
index 01b32c3..921dc73 100755
--- a/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools
+++ b/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools
@@ -1,6 +1,6 @@
 #!/sbin/runscript
 #
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/5.0.0/vmware-workstation-tools,v 1.3 2006/05/08 13:56:34 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools,v 1.2 2007/03/07 21:04:56 wolf31o2 Exp $
 #
 # This script manages the services needed to run VMware software
 
diff --git a/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools.rc b/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools.rc
index 69bc2c6..ca82904 100644
--- a/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools.rc
+++ b/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware.rc,v 1.5 2005/12/19 16:16:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation-tools/files/vmware-workstation-tools.rc,v 1.5 2007/04/28 10:08:45 ikelos Exp $
 
 depend() {
 	before checkfs
diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest
index d48d322..a1badf8 100644
--- a/app-emulation/vmware-workstation/Manifest
+++ b/app-emulation/vmware-workstation/Manifest
@@ -26,10 +26,10 @@ AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA
 MD5 aff74afc68b848e408f93e60bdf847c9 files/90vmware-workstation 106
 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a files/90vmware-workstation 106
 SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e files/90vmware-workstation 106
-AUX vmware-workstation.rc 1427 RMD160 e7cc199e3f2fbf552cc44a721fce97aa898e11e3 SHA1 ac14c8c847b7ad1f81f693724db5d090e5f19db2 SHA256 46aa28bab02de4ee28acbd10b9dc20946aa931aaec20212051545a4873d843a2
-MD5 ffae763de9edbb3471f298cef5256697 files/vmware-workstation.rc 1427
-RMD160 e7cc199e3f2fbf552cc44a721fce97aa898e11e3 files/vmware-workstation.rc 1427
-SHA256 46aa28bab02de4ee28acbd10b9dc20946aa931aaec20212051545a4873d843a2 files/vmware-workstation.rc 1427
+AUX vmware-workstation.rc 1425 RMD160 61d9725a8b75e0fd919f2f1c5f0340695600b10d SHA1 a839b18f2c1a048161a0cbcc1a09842e05063921 SHA256 0853d97e09c1861fd27ccb72977d64e49af69daedc9122922d5fd604e040f5b1
+MD5 38c658493da5770808944126863f7df0 files/vmware-workstation.rc 1425
+RMD160 61d9725a8b75e0fd919f2f1c5f0340695600b10d files/vmware-workstation.rc 1425
+SHA256 0853d97e09c1861fd27ccb72977d64e49af69daedc9122922d5fd604e040f5b1 files/vmware-workstation.rc 1425
 AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
 MD5 aa1b576735134579f04b29763901dc4f files/vmware-workstation.xml 1592
 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware-workstation.xml 1592
@@ -37,10 +37,10 @@ SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vm
 DIST VMware-workstation-6.0.0-45731.i386.tar.gz 190053947 RMD160 cb20bebe843ef7ae6b0fe3155b61bd8d29fbdaa2 SHA1 2daa71872b1e03f01843a918c7301c7b577585a7 SHA256 6781820f88c2321ecd9fe12f1a228703717b92447565cef40648789dde06e698
 DIST VMware-workstation-6.0.0-45731.x86_64.tar.gz 166956169 RMD160 355db06ad645032ce575deb8afea2c7e1d53dff3 SHA1 3a57951e6771faa065d6e75ba01b44bd6dd3462a SHA256 b6a46596f17e67cd1473a82844fc2828a48af81d088a7ae3908d3092f754a842
 DIST vmware-any-any-update112.tar.gz 469362 RMD160 380bd15513583055cf0810c16ae11642454fafd3 SHA1 8d583e3779950362c1e07c5fb839f77a45a2d3ca SHA256 f6da5636812cdb72cc8036da2f23df1abe6dbe7714c029f89ad3f042b092abb2
-EBUILD vmware-workstation-6.0.0.45731.ebuild 3966 RMD160 a4b08dfa352cf50035308c83dd153dbc2aeacd80 SHA1 a3ea722a0cdcd27ec7c793ab3290b1ec1ddd2fa3 SHA256 0c629095d2e9fd24921d2d225fd5fb8a0752230205dfde001e1080fb8775eead
-MD5 8840af910ee7124f0fdbc1adb9fae0ad vmware-workstation-6.0.0.45731.ebuild 3966
-RMD160 a4b08dfa352cf50035308c83dd153dbc2aeacd80 vmware-workstation-6.0.0.45731.ebuild 3966
-SHA256 0c629095d2e9fd24921d2d225fd5fb8a0752230205dfde001e1080fb8775eead vmware-workstation-6.0.0.45731.ebuild 3966
+EBUILD vmware-workstation-6.0.0.45731.ebuild 4072 RMD160 394944fb4b848982989b71f057f13de443111a2d SHA1 6bbb112e98c0317fbe5f6bb9a8ae8e73ec20effb SHA256 0b7cb603b0236ad160aa3e0b5b84c3991f562db92165c7fc38b6d36644951635
+MD5 93013927c5e08e10fd5d7f27ab0fea29 vmware-workstation-6.0.0.45731.ebuild 4072
+RMD160 394944fb4b848982989b71f057f13de443111a2d vmware-workstation-6.0.0.45731.ebuild 4072
+SHA256 0b7cb603b0236ad160aa3e0b5b84c3991f562db92165c7fc38b6d36644951635 vmware-workstation-6.0.0.45731.ebuild 4072
 MISC ChangeLog 12691 RMD160 c2004f093d1479978d7c0bb3a0d155851a577eac SHA1 d8e4b3b6d88469777866d80b513777171951a10c SHA256 af61d26d4fab464194c25841ce6dc6050dc5828ebe3eaf170dc531f627d7be7c
 MD5 3d2f699f8c2e2a402636dfc0f5822dda ChangeLog 12691
 RMD160 c2004f093d1479978d7c0bb3a0d155851a577eac ChangeLog 12691
diff --git a/app-emulation/vmware-workstation/files/vmware-workstation.rc b/app-emulation/vmware-workstation/files/vmware-workstation.rc
index 450db02..0eb17e2 100644
--- a/app-emulation/vmware-workstation/files/vmware-workstation.rc
+++ b/app-emulation/vmware-workstation/files/vmware-workstation.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation.rc,v 1.1 2006/08/04 14:46:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/files/vmware-workstation.rc,v 1.4 2007/04/28 10:04:05 ikelos Exp $
 
 depend() {
 	need localmount
diff --git a/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild b/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
index ed1a34d..c3efc83 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-6.0.0.45731.ebuild
@@ -9,7 +9,7 @@ MY_PN="VMware-workstation-$(replace_version_separator 3 - $PV)"
 DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
 HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
 SRC_URI="
-	x86? ( 
+	x86? (
 		mirror://vmware/software/wkst/${MY_PN}.i386.tar.gz
 		http://download.softpedia.ro/linux/${MY_PN}.i386.tar.gz )
 	amd64? (
@@ -29,7 +29,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="strip fetch"
 
-# vmware-workstation should not use virtual/libc as this is a 
+# vmware-workstation should not use virtual/libc as this is a
 # precompiled binary package thats linked to glibc.
 RDEPEND="sys-libs/glibc
 	amd64? (
@@ -120,6 +120,8 @@ pkg_nofetch() {
 	fi
 
 	einfo "Please download the ${MY_PN}.tar.gz at ${HOMEPAGE}"
+	einfo "${ANY_ANY}.tar.gz is also necessary for compilation"
+	einfo "but should already have been fetched."
 }
 
 src_install() {
diff --git a/eclass/vmware-mod.eclass b/eclass/vmware-mod.eclass
index 0958a8f..a10cc2b 100644
--- a/eclass/vmware-mod.eclass
+++ b/eclass/vmware-mod.eclass
@@ -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/eclass/vmware-mod.eclass,v 1.2 2006/08/08 19:16:42 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware-mod.eclass,v 1.11 2007/07/12 23:57:42 wolf31o2 Exp $
 
 
 # Ensure vmware comes before linux-mod since we want linux-mod's pkg_preinst and
@@ -9,8 +9,12 @@ inherit eutils vmware linux-mod
 
 DESCRIPTION="Modules for Vmware Programs"
 HOMEPAGE="http://www.vmware.com/"
-SRC_URI="http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
-		 http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz"
+SRC_URI="http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
+	http://platan.vc.cvut.cz/ftp/pub/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://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
+	http://ftp.cvut.cz/vmware/obselete/${ANY_ANY}.tar.gz"
 LICENSE="vmware"
 SLOT="0"
 IUSE=""
diff --git a/eclass/vmware.eclass b/eclass/vmware.eclass
index f6e16aa..ed41907 100644
--- a/eclass/vmware.eclass
+++ b/eclass/vmware.eclass
@@ -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/eclass/vmware.eclass,v 1.17 2006/11/29 21:12:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/vmware.eclass,v 1.24 2007/04/28 09:40:42 ikelos Exp $
 
 # This eclass is for all vmware-* ebuilds in the tree and should contain all
 # of the common components across the multiple packages.
@@ -271,7 +271,7 @@ vmware_src_install() {
 	fi
 
 	# Do we have vmware-ping/vmware-vmx?  If so, make them setuid.
-	for p in /bin/vmware-ping /lib/bin/vmware-vmx /lib/bin-debug/vmware-vm /sbin/vmware-authd;
+	for p in /bin/vmware-ping /lib/bin/vmware-vmx /lib/bin-debug/vmware-vmx /sbin/vmware-authd;
 	do
 		if [ -x "${D}${VMWARE_INSTALL_DIR}${p}" ]
 		then